Skip to content

purge six (even the vendored one) from non-vendored files #642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

purge six (even the vendored one) from non-vendored files #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 31 additions & 32 deletions src/oci/access_governance_cp/access_governance_cp_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}")
Expand All @@ -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 = {
Expand All @@ -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'),
Expand Down Expand Up @@ -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}")
Expand All @@ -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'),
Expand Down Expand Up @@ -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}")
Expand All @@ -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 = {
Expand All @@ -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'),
Expand Down Expand Up @@ -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}")
Expand All @@ -500,18 +499,18 @@ 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 = {
"accept": "application/json",
"content-type": "application/json",
"opc-request-id": kwargs.get("opc_request_id", missing)
}
header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None}
header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None}

retry_strategy = self.base_client.get_preferred_retry_strategy(
operation_retry_strategy=kwargs.get('retry_strategy'),
Expand Down Expand Up @@ -589,22 +588,22 @@ 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}")

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'),
Expand Down Expand Up @@ -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}")
Expand Down Expand Up @@ -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'),
Expand Down Expand Up @@ -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}")
Expand All @@ -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 = {
Expand All @@ -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'),
Expand Down Expand Up @@ -951,23 +950,23 @@ 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}")

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",
"if-match": kwargs.get("if_match", missing),
"opc-request-id": kwargs.get("opc_request_id", missing)
}
header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None}
header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None}

retry_strategy = self.base_client.get_preferred_retry_strategy(
operation_retry_strategy=kwargs.get('retry_strategy'),
Expand Down
Loading