diff --git a/src/oci/_vendor/__init__.py b/src/oci/_vendor/__init__.py index 729b203c2a..c6710dd357 100644 --- a/src/oci/_vendor/__init__.py +++ b/src/oci/_vendor/__init__.py @@ -6,7 +6,6 @@ from . import httpsig_cffi # noqa: F401 from . import jwt # noqa: F401 from . import idna # noqa: F401 -from . import six # noqa: F401 from . import urllib3 # noqa: F401 from . import requests # noqa: F401 from . import sseclient # noqa: F401 diff --git a/src/oci/_vendor/httpsig_cffi/sign.py b/src/oci/_vendor/httpsig_cffi/sign.py index 1584e3999e..ad80533070 100644 --- a/src/oci/_vendor/httpsig_cffi/sign.py +++ b/src/oci/_vendor/httpsig_cffi/sign.py @@ -5,7 +5,6 @@ # Original Work: Copyright (c) 2012 Adam T. Lindsay (original author) import base64 -from oci._vendor import six from cryptography.hazmat.backends import default_backend # noqa: F401 from cryptography.hazmat.primitives import hashes, hmac, serialization # noqa: F401 @@ -29,7 +28,7 @@ def __init__(self, secret, algorithm=None): algorithm = DEFAULT_SIGN_ALGORITHM assert algorithm in ALGORITHMS, "Unknown algorithm" # noqa: F405 - if isinstance(secret, six.string_types): + if isinstance(secret, str): secret = secret.encode("ascii") self._rsa_public = None @@ -66,19 +65,19 @@ def algorithm(self): return '%s-%s' % (self.sign_algorithm, self.hash_algorithm) def _sign_rsa(self, data): - if isinstance(data, six.string_types): + if isinstance(data, str): data = data.encode("ascii") return self._rsa_private.sign(data, padding.PKCS1v15(), self._rsahash()) def _sign_hmac(self, data): - if isinstance(data, six.string_types): + if isinstance(data, str): data = data.encode("ascii") hmac = self._hash.copy() hmac.update(data) return hmac.finalize() def _sign(self, data): - if isinstance(data, six.string_types): + if isinstance(data, str): data = data.encode("ascii") signed = None diff --git a/src/oci/_vendor/httpsig_cffi/utils.py b/src/oci/_vendor/httpsig_cffi/utils.py index 8dda9dce09..eff771842e 100644 --- a/src/oci/_vendor/httpsig_cffi/utils.py +++ b/src/oci/_vendor/httpsig_cffi/utils.py @@ -8,7 +8,6 @@ import struct import hashlib import base64 -from oci._vendor import six try: # Python 3 @@ -62,7 +61,7 @@ def generate_message(required_headers, headers, host=None, method=None, path=Non def parse_authorization_header(header): - if not isinstance(header, six.string_types): + if not isinstance(header, str): header = header.decode("ascii") # HTTP headers cannot be Unicode. auth = header.split(" ", 1) @@ -140,7 +139,7 @@ class CaseInsensitiveDict(dict): def __init__(self, d=None, **kwargs): super(CaseInsensitiveDict, self).__init__(**kwargs) if d: - self.update((k.lower(), v) for k, v in six.iteritems(d)) + self.update((k.lower(), v) for k, v in d.items()) def __setitem__(self, key, value): super(CaseInsensitiveDict, self).__setitem__(key.lower(), value) diff --git a/src/oci/_vendor/httpsig_cffi/verify.py b/src/oci/_vendor/httpsig_cffi/verify.py index d2eb1c35d6..bd833060da 100644 --- a/src/oci/_vendor/httpsig_cffi/verify.py +++ b/src/oci/_vendor/httpsig_cffi/verify.py @@ -7,7 +7,6 @@ """ Module to assist in verifying a signed header. """ -from oci._vendor import six from cryptography.hazmat.backends import default_backend # noqa: 401 from cryptography.hazmat.primitives import hashes, hmac, serialization # noqa: 401 @@ -33,9 +32,9 @@ def _verify(self, data, signature): `signature` is a base64-encoded signature to verify against `data` """ - if isinstance(data, six.string_types): + if isinstance(data, str): data = data.encode("ascii") - if isinstance(signature, six.string_types): + if isinstance(signature, str): signature = signature.encode("ascii") if self.sign_algorithm == 'rsa': diff --git a/src/oci/_vendor/six.py b/src/oci/_vendor/six.py deleted file mode 100644 index 4e15675d8b..0000000000 --- a/src/oci/_vendor/six.py +++ /dev/null @@ -1,998 +0,0 @@ -# Copyright (c) 2010-2020 Benjamin Peterson -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -"""Utilities for writing code that runs on Python 2 and 3""" - -from __future__ import absolute_import - -import functools -import itertools -import operator -import sys -import types - -__author__ = "Benjamin Peterson " -__version__ = "1.16.0" - - -# Useful for very coarse version differentiation. -PY2 = sys.version_info[0] == 2 -PY3 = sys.version_info[0] == 3 -PY34 = sys.version_info[0:2] >= (3, 4) - -if PY3: - string_types = str, - integer_types = int, - class_types = type, - text_type = str - binary_type = bytes - - MAXSIZE = sys.maxsize -else: - string_types = basestring, - integer_types = (int, long) - class_types = (type, types.ClassType) - text_type = unicode - binary_type = str - - if sys.platform.startswith("java"): - # Jython always uses 32 bits. - MAXSIZE = int((1 << 31) - 1) - else: - # It's possible to have sizeof(long) != sizeof(Py_ssize_t). - class X(object): - - def __len__(self): - return 1 << 31 - try: - len(X()) - except OverflowError: - # 32-bit - MAXSIZE = int((1 << 31) - 1) - else: - # 64-bit - MAXSIZE = int((1 << 63) - 1) - del X - -if PY34: - from importlib.util import spec_from_loader -else: - spec_from_loader = None - - -def _add_doc(func, doc): - """Add documentation to a function.""" - func.__doc__ = doc - - -def _import_module(name): - """Import module, returning the module after the last dot.""" - __import__(name) - return sys.modules[name] - - -class _LazyDescr(object): - - def __init__(self, name): - self.name = name - - def __get__(self, obj, tp): - result = self._resolve() - setattr(obj, self.name, result) # Invokes __set__. - try: - # This is a bit ugly, but it avoids running this again by - # removing this descriptor. - delattr(obj.__class__, self.name) - except AttributeError: - pass - return result - - -class MovedModule(_LazyDescr): - - def __init__(self, name, old, new=None): - super(MovedModule, self).__init__(name) - if PY3: - if new is None: - new = name - self.mod = new - else: - self.mod = old - - def _resolve(self): - return _import_module(self.mod) - - def __getattr__(self, attr): - _module = self._resolve() - value = getattr(_module, attr) - setattr(self, attr, value) - return value - - -class _LazyModule(types.ModuleType): - - def __init__(self, name): - super(_LazyModule, self).__init__(name) - self.__doc__ = self.__class__.__doc__ - - def __dir__(self): - attrs = ["__doc__", "__name__"] - attrs += [attr.name for attr in self._moved_attributes] - return attrs - - # Subclasses should override this - _moved_attributes = [] - - -class MovedAttribute(_LazyDescr): - - def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None): - super(MovedAttribute, self).__init__(name) - if PY3: - if new_mod is None: - new_mod = name - self.mod = new_mod - if new_attr is None: - if old_attr is None: - new_attr = name - else: - new_attr = old_attr - self.attr = new_attr - else: - self.mod = old_mod - if old_attr is None: - old_attr = name - self.attr = old_attr - - def _resolve(self): - module = _import_module(self.mod) - return getattr(module, self.attr) - - -class _SixMetaPathImporter(object): - - """ - A meta path importer to import six.moves and its submodules. - - This class implements a PEP302 finder and loader. It should be compatible - with Python 2.5 and all existing versions of Python3 - """ - - def __init__(self, six_module_name): - self.name = six_module_name - self.known_modules = {} - - def _add_module(self, mod, *fullnames): - for fullname in fullnames: - self.known_modules[self.name + "." + fullname] = mod - - def _get_module(self, fullname): - return self.known_modules[self.name + "." + fullname] - - def find_module(self, fullname, path=None): - if fullname in self.known_modules: - return self - return None - - def find_spec(self, fullname, path, target=None): - if fullname in self.known_modules: - return spec_from_loader(fullname, self) - return None - - def __get_module(self, fullname): - try: - return self.known_modules[fullname] - except KeyError: - raise ImportError("This loader does not know module " + fullname) - - def load_module(self, fullname): - try: - # in case of a reload - return sys.modules[fullname] - except KeyError: - pass - mod = self.__get_module(fullname) - if isinstance(mod, MovedModule): - mod = mod._resolve() - else: - mod.__loader__ = self - sys.modules[fullname] = mod - return mod - - def is_package(self, fullname): - """ - Return true, if the named module is a package. - - We need this method to get correct spec objects with - Python 3.4 (see PEP451) - """ - return hasattr(self.__get_module(fullname), "__path__") - - def get_code(self, fullname): - """Return None - - Required, if is_package is implemented""" - self.__get_module(fullname) # eventually raises ImportError - return None - get_source = get_code # same as get_code - - def create_module(self, spec): - return self.load_module(spec.name) - - def exec_module(self, module): - pass - -_importer = _SixMetaPathImporter(__name__) - - -class _MovedItems(_LazyModule): - - """Lazy loading of moved objects""" - __path__ = [] # mark as package - - -_moved_attributes = [ - MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"), - MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"), - MovedAttribute("filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"), - MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"), - MovedAttribute("intern", "__builtin__", "sys"), - MovedAttribute("map", "itertools", "builtins", "imap", "map"), - MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"), - MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"), - MovedAttribute("getoutput", "commands", "subprocess"), - MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"), - MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"), - MovedAttribute("reduce", "__builtin__", "functools"), - MovedAttribute("shlex_quote", "pipes", "shlex", "quote"), - MovedAttribute("StringIO", "StringIO", "io"), - MovedAttribute("UserDict", "UserDict", "collections"), - MovedAttribute("UserList", "UserList", "collections"), - MovedAttribute("UserString", "UserString", "collections"), - MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"), - MovedAttribute("zip", "itertools", "builtins", "izip", "zip"), - MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"), - MovedModule("builtins", "__builtin__"), - MovedModule("configparser", "ConfigParser"), - MovedModule("collections_abc", "collections", "collections.abc" if sys.version_info >= (3, 3) else "collections"), - MovedModule("copyreg", "copy_reg"), - MovedModule("dbm_gnu", "gdbm", "dbm.gnu"), - MovedModule("dbm_ndbm", "dbm", "dbm.ndbm"), - MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread" if sys.version_info < (3, 9) else "_thread"), - MovedModule("http_cookiejar", "cookielib", "http.cookiejar"), - MovedModule("http_cookies", "Cookie", "http.cookies"), - MovedModule("html_entities", "htmlentitydefs", "html.entities"), - MovedModule("html_parser", "HTMLParser", "html.parser"), - MovedModule("http_client", "httplib", "http.client"), - MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"), - MovedModule("email_mime_image", "email.MIMEImage", "email.mime.image"), - MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"), - MovedModule("email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"), - MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"), - MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"), - MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"), - MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"), - MovedModule("cPickle", "cPickle", "pickle"), - MovedModule("queue", "Queue"), - MovedModule("reprlib", "repr"), - MovedModule("socketserver", "SocketServer"), - MovedModule("_thread", "thread", "_thread"), - MovedModule("tkinter", "Tkinter"), - MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"), - MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"), - MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"), - MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"), - MovedModule("tkinter_tix", "Tix", "tkinter.tix"), - MovedModule("tkinter_ttk", "ttk", "tkinter.ttk"), - MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"), - MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"), - MovedModule("tkinter_colorchooser", "tkColorChooser", - "tkinter.colorchooser"), - MovedModule("tkinter_commondialog", "tkCommonDialog", - "tkinter.commondialog"), - MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"), - MovedModule("tkinter_font", "tkFont", "tkinter.font"), - MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"), - MovedModule("tkinter_tksimpledialog", "tkSimpleDialog", - "tkinter.simpledialog"), - MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"), - MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"), - MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"), - MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"), - MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"), - MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"), -] -# Add windows specific modules. -if sys.platform == "win32": - _moved_attributes += [ - MovedModule("winreg", "_winreg"), - ] - -for attr in _moved_attributes: - setattr(_MovedItems, attr.name, attr) - if isinstance(attr, MovedModule): - _importer._add_module(attr, "moves." + attr.name) -del attr - -_MovedItems._moved_attributes = _moved_attributes - -moves = _MovedItems(__name__ + ".moves") -_importer._add_module(moves, "moves") - - -class Module_six_moves_urllib_parse(_LazyModule): - - """Lazy loading of moved objects in six.moves.urllib_parse""" - - -_urllib_parse_moved_attributes = [ - MovedAttribute("ParseResult", "urlparse", "urllib.parse"), - MovedAttribute("SplitResult", "urlparse", "urllib.parse"), - MovedAttribute("parse_qs", "urlparse", "urllib.parse"), - MovedAttribute("parse_qsl", "urlparse", "urllib.parse"), - MovedAttribute("urldefrag", "urlparse", "urllib.parse"), - MovedAttribute("urljoin", "urlparse", "urllib.parse"), - MovedAttribute("urlparse", "urlparse", "urllib.parse"), - MovedAttribute("urlsplit", "urlparse", "urllib.parse"), - MovedAttribute("urlunparse", "urlparse", "urllib.parse"), - MovedAttribute("urlunsplit", "urlparse", "urllib.parse"), - MovedAttribute("quote", "urllib", "urllib.parse"), - MovedAttribute("quote_plus", "urllib", "urllib.parse"), - MovedAttribute("unquote", "urllib", "urllib.parse"), - MovedAttribute("unquote_plus", "urllib", "urllib.parse"), - MovedAttribute("unquote_to_bytes", "urllib", "urllib.parse", "unquote", "unquote_to_bytes"), - MovedAttribute("urlencode", "urllib", "urllib.parse"), - MovedAttribute("splitquery", "urllib", "urllib.parse"), - MovedAttribute("splittag", "urllib", "urllib.parse"), - MovedAttribute("splituser", "urllib", "urllib.parse"), - MovedAttribute("splitvalue", "urllib", "urllib.parse"), - MovedAttribute("uses_fragment", "urlparse", "urllib.parse"), - MovedAttribute("uses_netloc", "urlparse", "urllib.parse"), - MovedAttribute("uses_params", "urlparse", "urllib.parse"), - MovedAttribute("uses_query", "urlparse", "urllib.parse"), - MovedAttribute("uses_relative", "urlparse", "urllib.parse"), -] -for attr in _urllib_parse_moved_attributes: - setattr(Module_six_moves_urllib_parse, attr.name, attr) -del attr - -Module_six_moves_urllib_parse._moved_attributes = _urllib_parse_moved_attributes - -_importer._add_module(Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse"), - "moves.urllib_parse", "moves.urllib.parse") - - -class Module_six_moves_urllib_error(_LazyModule): - - """Lazy loading of moved objects in six.moves.urllib_error""" - - -_urllib_error_moved_attributes = [ - MovedAttribute("URLError", "urllib2", "urllib.error"), - MovedAttribute("HTTPError", "urllib2", "urllib.error"), - MovedAttribute("ContentTooShortError", "urllib", "urllib.error"), -] -for attr in _urllib_error_moved_attributes: - setattr(Module_six_moves_urllib_error, attr.name, attr) -del attr - -Module_six_moves_urllib_error._moved_attributes = _urllib_error_moved_attributes - -_importer._add_module(Module_six_moves_urllib_error(__name__ + ".moves.urllib.error"), - "moves.urllib_error", "moves.urllib.error") - - -class Module_six_moves_urllib_request(_LazyModule): - - """Lazy loading of moved objects in six.moves.urllib_request""" - - -_urllib_request_moved_attributes = [ - MovedAttribute("urlopen", "urllib2", "urllib.request"), - MovedAttribute("install_opener", "urllib2", "urllib.request"), - MovedAttribute("build_opener", "urllib2", "urllib.request"), - MovedAttribute("pathname2url", "urllib", "urllib.request"), - MovedAttribute("url2pathname", "urllib", "urllib.request"), - MovedAttribute("getproxies", "urllib", "urllib.request"), - MovedAttribute("Request", "urllib2", "urllib.request"), - MovedAttribute("OpenerDirector", "urllib2", "urllib.request"), - MovedAttribute("HTTPDefaultErrorHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPRedirectHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPCookieProcessor", "urllib2", "urllib.request"), - MovedAttribute("ProxyHandler", "urllib2", "urllib.request"), - MovedAttribute("BaseHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPPasswordMgr", "urllib2", "urllib.request"), - MovedAttribute("HTTPPasswordMgrWithDefaultRealm", "urllib2", "urllib.request"), - MovedAttribute("AbstractBasicAuthHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPBasicAuthHandler", "urllib2", "urllib.request"), - MovedAttribute("ProxyBasicAuthHandler", "urllib2", "urllib.request"), - MovedAttribute("AbstractDigestAuthHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPDigestAuthHandler", "urllib2", "urllib.request"), - MovedAttribute("ProxyDigestAuthHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPSHandler", "urllib2", "urllib.request"), - MovedAttribute("FileHandler", "urllib2", "urllib.request"), - MovedAttribute("FTPHandler", "urllib2", "urllib.request"), - MovedAttribute("CacheFTPHandler", "urllib2", "urllib.request"), - MovedAttribute("UnknownHandler", "urllib2", "urllib.request"), - MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"), - MovedAttribute("urlretrieve", "urllib", "urllib.request"), - MovedAttribute("urlcleanup", "urllib", "urllib.request"), - MovedAttribute("URLopener", "urllib", "urllib.request"), - MovedAttribute("FancyURLopener", "urllib", "urllib.request"), - MovedAttribute("proxy_bypass", "urllib", "urllib.request"), - MovedAttribute("parse_http_list", "urllib2", "urllib.request"), - MovedAttribute("parse_keqv_list", "urllib2", "urllib.request"), -] -for attr in _urllib_request_moved_attributes: - setattr(Module_six_moves_urllib_request, attr.name, attr) -del attr - -Module_six_moves_urllib_request._moved_attributes = _urllib_request_moved_attributes - -_importer._add_module(Module_six_moves_urllib_request(__name__ + ".moves.urllib.request"), - "moves.urllib_request", "moves.urllib.request") - - -class Module_six_moves_urllib_response(_LazyModule): - - """Lazy loading of moved objects in six.moves.urllib_response""" - - -_urllib_response_moved_attributes = [ - MovedAttribute("addbase", "urllib", "urllib.response"), - MovedAttribute("addclosehook", "urllib", "urllib.response"), - MovedAttribute("addinfo", "urllib", "urllib.response"), - MovedAttribute("addinfourl", "urllib", "urllib.response"), -] -for attr in _urllib_response_moved_attributes: - setattr(Module_six_moves_urllib_response, attr.name, attr) -del attr - -Module_six_moves_urllib_response._moved_attributes = _urllib_response_moved_attributes - -_importer._add_module(Module_six_moves_urllib_response(__name__ + ".moves.urllib.response"), - "moves.urllib_response", "moves.urllib.response") - - -class Module_six_moves_urllib_robotparser(_LazyModule): - - """Lazy loading of moved objects in six.moves.urllib_robotparser""" - - -_urllib_robotparser_moved_attributes = [ - MovedAttribute("RobotFileParser", "robotparser", "urllib.robotparser"), -] -for attr in _urllib_robotparser_moved_attributes: - setattr(Module_six_moves_urllib_robotparser, attr.name, attr) -del attr - -Module_six_moves_urllib_robotparser._moved_attributes = _urllib_robotparser_moved_attributes - -_importer._add_module(Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser"), - "moves.urllib_robotparser", "moves.urllib.robotparser") - - -class Module_six_moves_urllib(types.ModuleType): - - """Create a six.moves.urllib namespace that resembles the Python 3 namespace""" - __path__ = [] # mark as package - parse = _importer._get_module("moves.urllib_parse") - error = _importer._get_module("moves.urllib_error") - request = _importer._get_module("moves.urllib_request") - response = _importer._get_module("moves.urllib_response") - robotparser = _importer._get_module("moves.urllib_robotparser") - - def __dir__(self): - return ['parse', 'error', 'request', 'response', 'robotparser'] - -_importer._add_module(Module_six_moves_urllib(__name__ + ".moves.urllib"), - "moves.urllib") - - -def add_move(move): - """Add an item to six.moves.""" - setattr(_MovedItems, move.name, move) - - -def remove_move(name): - """Remove item from six.moves.""" - try: - delattr(_MovedItems, name) - except AttributeError: - try: - del moves.__dict__[name] - except KeyError: - raise AttributeError("no such move, %r" % (name,)) - - -if PY3: - _meth_func = "__func__" - _meth_self = "__self__" - - _func_closure = "__closure__" - _func_code = "__code__" - _func_defaults = "__defaults__" - _func_globals = "__globals__" -else: - _meth_func = "im_func" - _meth_self = "im_self" - - _func_closure = "func_closure" - _func_code = "func_code" - _func_defaults = "func_defaults" - _func_globals = "func_globals" - - -try: - advance_iterator = next -except NameError: - def advance_iterator(it): - return it.next() -next = advance_iterator - - -try: - callable = callable -except NameError: - def callable(obj): - return any("__call__" in klass.__dict__ for klass in type(obj).__mro__) - - -if PY3: - def get_unbound_function(unbound): - return unbound - - create_bound_method = types.MethodType - - def create_unbound_method(func, cls): - return func - - Iterator = object -else: - def get_unbound_function(unbound): - return unbound.im_func - - def create_bound_method(func, obj): - return types.MethodType(func, obj, obj.__class__) - - def create_unbound_method(func, cls): - return types.MethodType(func, None, cls) - - class Iterator(object): - - def next(self): - return type(self).__next__(self) - - callable = callable -_add_doc(get_unbound_function, - """Get the function out of a possibly unbound function""") - - -get_method_function = operator.attrgetter(_meth_func) -get_method_self = operator.attrgetter(_meth_self) -get_function_closure = operator.attrgetter(_func_closure) -get_function_code = operator.attrgetter(_func_code) -get_function_defaults = operator.attrgetter(_func_defaults) -get_function_globals = operator.attrgetter(_func_globals) - - -if PY3: - def iterkeys(d, **kw): - return iter(d.keys(**kw)) - - def itervalues(d, **kw): - return iter(d.values(**kw)) - - def iteritems(d, **kw): - return iter(d.items(**kw)) - - def iterlists(d, **kw): - return iter(d.lists(**kw)) - - viewkeys = operator.methodcaller("keys") - - viewvalues = operator.methodcaller("values") - - viewitems = operator.methodcaller("items") -else: - def iterkeys(d, **kw): - return d.iterkeys(**kw) - - def itervalues(d, **kw): - return d.itervalues(**kw) - - def iteritems(d, **kw): - return d.iteritems(**kw) - - def iterlists(d, **kw): - return d.iterlists(**kw) - - viewkeys = operator.methodcaller("viewkeys") - - viewvalues = operator.methodcaller("viewvalues") - - viewitems = operator.methodcaller("viewitems") - -_add_doc(iterkeys, "Return an iterator over the keys of a dictionary.") -_add_doc(itervalues, "Return an iterator over the values of a dictionary.") -_add_doc(iteritems, - "Return an iterator over the (key, value) pairs of a dictionary.") -_add_doc(iterlists, - "Return an iterator over the (key, [values]) pairs of a dictionary.") - - -if PY3: - def b(s): - return s.encode("latin-1") - - def u(s): - return s - unichr = chr - import struct - int2byte = struct.Struct(">B").pack - del struct - byte2int = operator.itemgetter(0) - indexbytes = operator.getitem - iterbytes = iter - import io - StringIO = io.StringIO - BytesIO = io.BytesIO - del io - _assertCountEqual = "assertCountEqual" - if sys.version_info[1] <= 1: - _assertRaisesRegex = "assertRaisesRegexp" - _assertRegex = "assertRegexpMatches" - _assertNotRegex = "assertNotRegexpMatches" - else: - _assertRaisesRegex = "assertRaisesRegex" - _assertRegex = "assertRegex" - _assertNotRegex = "assertNotRegex" -else: - def b(s): - return s - # Workaround for standalone backslash - - def u(s): - return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape") - unichr = unichr - int2byte = chr - - def byte2int(bs): - return ord(bs[0]) - - def indexbytes(buf, i): - return ord(buf[i]) - iterbytes = functools.partial(itertools.imap, ord) - import StringIO - StringIO = BytesIO = StringIO.StringIO - _assertCountEqual = "assertItemsEqual" - _assertRaisesRegex = "assertRaisesRegexp" - _assertRegex = "assertRegexpMatches" - _assertNotRegex = "assertNotRegexpMatches" -_add_doc(b, """Byte literal""") -_add_doc(u, """Text literal""") - - -def assertCountEqual(self, *args, **kwargs): - return getattr(self, _assertCountEqual)(*args, **kwargs) - - -def assertRaisesRegex(self, *args, **kwargs): - return getattr(self, _assertRaisesRegex)(*args, **kwargs) - - -def assertRegex(self, *args, **kwargs): - return getattr(self, _assertRegex)(*args, **kwargs) - - -def assertNotRegex(self, *args, **kwargs): - return getattr(self, _assertNotRegex)(*args, **kwargs) - - -if PY3: - exec_ = getattr(moves.builtins, "exec") - - def reraise(tp, value, tb=None): - try: - if value is None: - value = tp() - if value.__traceback__ is not tb: - raise value.with_traceback(tb) - raise value - finally: - value = None - tb = None - -else: - def exec_(_code_, _globs_=None, _locs_=None): - """Execute code in a namespace.""" - if _globs_ is None: - frame = sys._getframe(1) - _globs_ = frame.f_globals - if _locs_ is None: - _locs_ = frame.f_locals - del frame - elif _locs_ is None: - _locs_ = _globs_ - exec("""exec _code_ in _globs_, _locs_""") - - exec_("""def reraise(tp, value, tb=None): - try: - raise tp, value, tb - finally: - tb = None -""") - - -if sys.version_info[:2] > (3,): - exec_("""def raise_from(value, from_value): - try: - raise value from from_value - finally: - value = None -""") -else: - def raise_from(value, from_value): - raise value - - -print_ = getattr(moves.builtins, "print", None) -if print_ is None: - def print_(*args, **kwargs): - """The new-style print function for Python 2.4 and 2.5.""" - fp = kwargs.pop("file", sys.stdout) - if fp is None: - return - - def write(data): - if not isinstance(data, basestring): - data = str(data) - # If the file has an encoding, encode unicode with it. - if (isinstance(fp, file) and - isinstance(data, unicode) and - fp.encoding is not None): - errors = getattr(fp, "errors", None) - if errors is None: - errors = "strict" - data = data.encode(fp.encoding, errors) - fp.write(data) - want_unicode = False - sep = kwargs.pop("sep", None) - if sep is not None: - if isinstance(sep, unicode): - want_unicode = True - elif not isinstance(sep, str): - raise TypeError("sep must be None or a string") - end = kwargs.pop("end", None) - if end is not None: - if isinstance(end, unicode): - want_unicode = True - elif not isinstance(end, str): - raise TypeError("end must be None or a string") - if kwargs: - raise TypeError("invalid keyword arguments to print()") - if not want_unicode: - for arg in args: - if isinstance(arg, unicode): - want_unicode = True - break - if want_unicode: - newline = unicode("\n") - space = unicode(" ") - else: - newline = "\n" - space = " " - if sep is None: - sep = space - if end is None: - end = newline - for i, arg in enumerate(args): - if i: - write(sep) - write(arg) - write(end) -if sys.version_info[:2] < (3, 3): - _print = print_ - - def print_(*args, **kwargs): - fp = kwargs.get("file", sys.stdout) - flush = kwargs.pop("flush", False) - _print(*args, **kwargs) - if flush and fp is not None: - fp.flush() - -_add_doc(reraise, """Reraise an exception.""") - -if sys.version_info[0:2] < (3, 4): - # This does exactly the same what the :func:`py3:functools.update_wrapper` - # function does on Python versions after 3.2. It sets the ``__wrapped__`` - # attribute on ``wrapper`` object and it doesn't raise an error if any of - # the attributes mentioned in ``assigned`` and ``updated`` are missing on - # ``wrapped`` object. - def _update_wrapper(wrapper, wrapped, - assigned=functools.WRAPPER_ASSIGNMENTS, - updated=functools.WRAPPER_UPDATES): - for attr in assigned: - try: - value = getattr(wrapped, attr) - except AttributeError: - continue - else: - setattr(wrapper, attr, value) - for attr in updated: - getattr(wrapper, attr).update(getattr(wrapped, attr, {})) - wrapper.__wrapped__ = wrapped - return wrapper - _update_wrapper.__doc__ = functools.update_wrapper.__doc__ - - def wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS, - updated=functools.WRAPPER_UPDATES): - return functools.partial(_update_wrapper, wrapped=wrapped, - assigned=assigned, updated=updated) - wraps.__doc__ = functools.wraps.__doc__ - -else: - wraps = functools.wraps - - -def with_metaclass(meta, *bases): - """Create a base class with a metaclass.""" - # This requires a bit of explanation: the basic idea is to make a dummy - # metaclass for one level of class instantiation that replaces itself with - # the actual metaclass. - class metaclass(type): - - def __new__(cls, name, this_bases, d): - if sys.version_info[:2] >= (3, 7): - # This version introduced PEP 560 that requires a bit - # of extra care (we mimic what is done by __build_class__). - resolved_bases = types.resolve_bases(bases) - if resolved_bases is not bases: - d['__orig_bases__'] = bases - else: - resolved_bases = bases - return meta(name, resolved_bases, d) - - @classmethod - def __prepare__(cls, name, this_bases): - return meta.__prepare__(name, bases) - return type.__new__(metaclass, 'temporary_class', (), {}) - - -def add_metaclass(metaclass): - """Class decorator for creating a class with a metaclass.""" - def wrapper(cls): - orig_vars = cls.__dict__.copy() - slots = orig_vars.get('__slots__') - if slots is not None: - if isinstance(slots, str): - slots = [slots] - for slots_var in slots: - orig_vars.pop(slots_var) - orig_vars.pop('__dict__', None) - orig_vars.pop('__weakref__', None) - if hasattr(cls, '__qualname__'): - orig_vars['__qualname__'] = cls.__qualname__ - return metaclass(cls.__name__, cls.__bases__, orig_vars) - return wrapper - - -def ensure_binary(s, encoding='utf-8', errors='strict'): - """Coerce **s** to six.binary_type. - - For Python 2: - - `unicode` -> encoded to `str` - - `str` -> `str` - - For Python 3: - - `str` -> encoded to `bytes` - - `bytes` -> `bytes` - """ - if isinstance(s, binary_type): - return s - if isinstance(s, text_type): - return s.encode(encoding, errors) - raise TypeError("not expecting type '%s'" % type(s)) - - -def ensure_str(s, encoding='utf-8', errors='strict'): - """Coerce *s* to `str`. - - For Python 2: - - `unicode` -> encoded to `str` - - `str` -> `str` - - For Python 3: - - `str` -> `str` - - `bytes` -> decoded to `str` - """ - # Optimization: Fast return for the common case. - if type(s) is str: - return s - if PY2 and isinstance(s, text_type): - return s.encode(encoding, errors) - elif PY3 and isinstance(s, binary_type): - return s.decode(encoding, errors) - elif not isinstance(s, (text_type, binary_type)): - raise TypeError("not expecting type '%s'" % type(s)) - return s - - -def ensure_text(s, encoding='utf-8', errors='strict'): - """Coerce *s* to six.text_type. - - For Python 2: - - `unicode` -> `unicode` - - `str` -> `unicode` - - For Python 3: - - `str` -> `str` - - `bytes` -> decoded to `str` - """ - if isinstance(s, binary_type): - return s.decode(encoding, errors) - elif isinstance(s, text_type): - return s - else: - raise TypeError("not expecting type '%s'" % type(s)) - - -def python_2_unicode_compatible(klass): - """ - A class decorator that defines __unicode__ and __str__ methods under Python 2. - Under Python 3 it does nothing. - - To support Python 2 and 3 with a single code base, define a __str__ method - returning text and apply this decorator to the class. - """ - if PY2: - if '__str__' not in klass.__dict__: - raise ValueError("@python_2_unicode_compatible cannot be applied " - "to %s because it doesn't define __str__()." % - klass.__name__) - klass.__unicode__ = klass.__str__ - klass.__str__ = lambda self: self.__unicode__().encode('utf-8') - return klass - - -# Complete the moves implementation. -# This code is at the end of this module to speed up module loading. -# Turn this module into a package. -__path__ = [] # required for PEP 302 and PEP 451 -__package__ = __name__ # see PEP 366 @ReservedAssignment -if globals().get("__spec__") is not None: - __spec__.submodule_search_locations = [] # PEP 451 @UndefinedVariable -# Remove other six meta path importers, since they cause problems. This can -# happen if six is removed from sys.modules and then reloaded. (Setuptools does -# this for some reason.) -if sys.meta_path: - for i, importer in enumerate(sys.meta_path): - # Here's some real nastiness: Another "instance" of the six module might - # be floating around. Therefore, we can't use isinstance() to check for - # the six meta path importer, since the other six instance will have - # inserted an importer with different class. - if (type(importer).__name__ == "_SixMetaPathImporter" and - importer.name == __name__): - del sys.meta_path[i] - break - del i, importer -# Finally, add the importer to the meta path import hook. -sys.meta_path.append(_importer) diff --git a/src/oci/_vendor/urllib3/connection.py b/src/oci/_vendor/urllib3/connection.py index c38c812eb9..9f59cda8ab 100644 --- a/src/oci/_vendor/urllib3/connection.py +++ b/src/oci/_vendor/urllib3/connection.py @@ -269,7 +269,7 @@ def request_chunked(self, method, url, body=None, headers=None): self.endheaders() if body is not None: - stringish_types = six.string_types + (bytes,) + stringish_types = str + (bytes,) if isinstance(body, stringish_types): body = (body,) for chunk in body: diff --git a/src/oci/_vendor/urllib3/contrib/pyopenssl.py b/src/oci/_vendor/urllib3/contrib/pyopenssl.py index 8c76faf848..6c975dafc3 100644 --- a/src/oci/_vendor/urllib3/contrib/pyopenssl.py +++ b/src/oci/_vendor/urllib3/contrib/pyopenssl.py @@ -478,7 +478,7 @@ def load_verify_locations(self, cafile=None, capath=None, cadata=None): def load_cert_chain(self, certfile, keyfile=None, password=None): self._ctx.use_certificate_chain_file(certfile) if password is not None: - if not isinstance(password, six.binary_type): + if not isinstance(password, bytes): password = password.encode("utf-8") self._ctx.set_passwd_cb(lambda *_: password) self._ctx.use_privatekey_file(keyfile or certfile) diff --git a/src/oci/_vendor/urllib3/fields.py b/src/oci/_vendor/urllib3/fields.py index 4508aa5e91..2d94c94621 100644 --- a/src/oci/_vendor/urllib3/fields.py +++ b/src/oci/_vendor/urllib3/fields.py @@ -42,7 +42,7 @@ def format_header_param_rfc2231(name, value): :ret: An RFC-2231-formatted unicode string. """ - if isinstance(value, six.binary_type): + if isinstance(value, bytes): value = value.decode("utf-8") if not any(ch in value for ch in '"\\\r\n'): @@ -116,7 +116,7 @@ def format_header_param_html5(name, value): :ret: A unicode string, stripped of troublesome characters. """ - if isinstance(value, six.binary_type): + if isinstance(value, bytes): value = value.decode("utf-8") value = _replace_multiple(value, _HTML5_REPLACEMENTS) diff --git a/src/oci/_vendor/urllib3/packages/six.py b/src/oci/_vendor/urllib3/packages/six.py index e640427c77..ef7cd2ac79 100644 --- a/src/oci/_vendor/urllib3/packages/six.py +++ b/src/oci/_vendor/urllib3/packages/six.py @@ -976,7 +976,7 @@ def wrapper(cls): def ensure_binary(s, encoding="utf-8", errors="strict"): - """Coerce **s** to six.binary_type. + """Coerce **s** to bytes. For Python 2: - `unicode` -> encoded to `str` diff --git a/src/oci/_vendor/urllib3/response.py b/src/oci/_vendor/urllib3/response.py index 48c890d23b..10f8fc5add 100644 --- a/src/oci/_vendor/urllib3/response.py +++ b/src/oci/_vendor/urllib3/response.py @@ -245,7 +245,7 @@ def __init__( self.msg = msg self._request_url = request_url - if body and isinstance(body, (six.string_types, bytes)): + if body and isinstance(body, (str, bytes)): self._body = body self._pool = pool diff --git a/src/oci/_vendor/urllib3/util/url.py b/src/oci/_vendor/urllib3/util/url.py index c60535c63b..d4027b3b38 100644 --- a/src/oci/_vendor/urllib3/util/url.py +++ b/src/oci/_vendor/urllib3/util/url.py @@ -278,7 +278,7 @@ def _remove_path_dot_segments(path): def _normalize_host(host, scheme): if host: - if isinstance(host, six.binary_type): + if isinstance(host, bytes): host = six.ensure_str(host) if scheme in NORMALIZABLE_SCHEMES: 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 6f1caf38e0..2dcea6f9a9 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 @@ -179,7 +178,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}") @@ -188,10 +187,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 = { @@ -201,7 +200,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'), @@ -288,7 +287,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}") @@ -299,7 +298,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'), @@ -394,7 +393,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}") @@ -403,10 +402,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 = { @@ -416,7 +415,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'), @@ -493,7 +492,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}") @@ -502,10 +501,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 = { @@ -513,7 +512,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'), @@ -591,7 +590,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}") @@ -599,14 +598,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'), @@ -716,7 +715,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}") @@ -745,14 +744,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'), @@ -841,7 +840,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}") @@ -850,10 +849,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 = { @@ -862,7 +861,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'), @@ -953,7 +952,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}") @@ -961,7 +960,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", @@ -969,7 +968,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 8a0d146271..188caa49d9 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 @@ -170,7 +169,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}") @@ -179,10 +178,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 = { @@ -191,7 +190,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'), @@ -283,7 +282,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}") @@ -292,10 +291,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 = { @@ -305,7 +304,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'), @@ -394,7 +393,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}") @@ -403,10 +402,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 = { @@ -415,7 +414,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'), @@ -512,7 +511,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}") @@ -521,10 +520,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 = { @@ -534,7 +533,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'), @@ -634,7 +633,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}") @@ -643,10 +642,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 = { @@ -656,7 +655,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'), @@ -754,7 +753,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}") @@ -763,10 +762,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 = { @@ -776,7 +775,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'), @@ -874,7 +873,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}") @@ -883,10 +882,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 = { @@ -896,7 +895,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'), @@ -983,7 +982,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}") @@ -994,7 +993,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'), @@ -1079,7 +1078,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}") @@ -1090,7 +1089,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'), @@ -1175,7 +1174,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}") @@ -1186,7 +1185,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'), @@ -1281,7 +1280,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}") @@ -1293,7 +1292,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'), @@ -1382,7 +1381,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}") @@ -1391,10 +1390,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 = { @@ -1403,7 +1402,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'), @@ -1489,7 +1488,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}") @@ -1498,10 +1497,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 = { @@ -1510,7 +1509,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'), @@ -1596,7 +1595,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}") @@ -1605,10 +1604,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 = { @@ -1617,7 +1616,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'), @@ -1701,7 +1700,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}") @@ -1710,10 +1709,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 = { @@ -1722,7 +1721,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'), @@ -1806,7 +1805,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}") @@ -1815,10 +1814,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 = { @@ -1827,7 +1826,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'), @@ -1905,7 +1904,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}") @@ -1914,10 +1913,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 = { @@ -1925,7 +1924,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'), @@ -2005,7 +2004,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}") @@ -2014,10 +2013,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 = { @@ -2025,7 +2024,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'), @@ -2103,7 +2102,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}") @@ -2112,10 +2111,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 = { @@ -2123,7 +2122,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'), @@ -2206,7 +2205,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}") @@ -2216,10 +2215,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 = { @@ -2227,7 +2226,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'), @@ -2305,7 +2304,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}") @@ -2314,10 +2313,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 = { @@ -2325,7 +2324,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'), @@ -2405,7 +2404,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}") @@ -2414,10 +2413,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 = { @@ -2425,7 +2424,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'), @@ -2537,7 +2536,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}") @@ -2546,10 +2545,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: @@ -2574,14 +2573,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'), @@ -2723,7 +2722,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}") @@ -2732,10 +2731,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: @@ -2773,14 +2772,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'), @@ -2901,7 +2900,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}") @@ -2937,14 +2936,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'), @@ -3065,7 +3064,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}") @@ -3101,14 +3100,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'), @@ -3234,7 +3233,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}") @@ -3271,14 +3270,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'), @@ -3393,7 +3392,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}") @@ -3402,10 +3401,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: @@ -3444,14 +3443,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'), @@ -3601,7 +3600,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}") @@ -3649,14 +3648,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'), @@ -3756,7 +3755,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}") @@ -3765,10 +3764,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: @@ -3791,14 +3790,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'), @@ -3900,7 +3899,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}") @@ -3909,10 +3908,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: @@ -3935,14 +3934,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'), @@ -4060,7 +4059,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}") @@ -4096,14 +4095,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'), @@ -4194,7 +4193,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}") @@ -4203,10 +4202,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 = { @@ -4215,7 +4214,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'), @@ -4306,7 +4305,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}") @@ -4315,10 +4314,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 = { @@ -4327,7 +4326,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'), @@ -4416,7 +4415,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}") @@ -4425,10 +4424,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 = { @@ -4437,7 +4436,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'), @@ -4528,7 +4527,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}") @@ -4537,10 +4536,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 = { @@ -4549,7 +4548,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_data_platform/ai_data_platform_client.py b/src/oci/ai_data_platform/ai_data_platform_client.py index f76185c959..1bc9c5a6ae 100644 --- a/src/oci/ai_data_platform/ai_data_platform_client.py +++ b/src/oci/ai_data_platform/ai_data_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 @@ -172,7 +171,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}") @@ -181,10 +180,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 = { @@ -193,7 +192,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'), @@ -287,7 +286,7 @@ def change_ai_data_platform_compartment(self, ai_data_platform_id, change_ai_dat "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_data_platform_compartment got unknown kwargs: {extra_kwargs!r}") @@ -296,10 +295,10 @@ def change_ai_data_platform_compartment(self, ai_data_platform_id, change_ai_dat "aiDataPlatformId": ai_data_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 = { @@ -308,7 +307,7 @@ def change_ai_data_platform_compartment(self, ai_data_platform_id, change_ai_dat "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_ai_data_platform(self, create_ai_data_platform_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_ai_data_platform got unknown kwargs: {extra_kwargs!r}") @@ -408,7 +407,7 @@ def create_ai_data_platform(self, create_ai_data_platform_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'), @@ -503,7 +502,7 @@ def delete_ai_data_platform(self, ai_data_platform_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_data_platform got unknown kwargs: {extra_kwargs!r}") @@ -512,16 +511,16 @@ def delete_ai_data_platform(self, ai_data_platform_id, **kwargs): "aiDataPlatformId": ai_data_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 = { "isForceDelete": kwargs.get("is_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", @@ -529,7 +528,7 @@ def delete_ai_data_platform(self, ai_data_platform_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -612,7 +611,7 @@ def get_ai_data_platform(self, ai_data_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_ai_data_platform got unknown kwargs: {extra_kwargs!r}") @@ -621,10 +620,10 @@ def get_ai_data_platform(self, ai_data_platform_id, **kwargs): "aiDataPlatformId": ai_data_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 = { @@ -632,7 +631,7 @@ def get_ai_data_platform(self, ai_data_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'), @@ -715,7 +714,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}") @@ -724,10 +723,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 = { @@ -735,7 +734,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'), @@ -876,7 +875,7 @@ def list_ai_data_platforms(self, **kwargs): "include_legacy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_data_platforms got unknown kwargs: {extra_kwargs!r}") @@ -921,14 +920,14 @@ def list_ai_data_platforms(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "includeLegacy": kwargs.get("include_legacy", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -1048,10 +1047,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: @@ -1074,14 +1073,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'), @@ -1194,7 +1193,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}") @@ -1203,10 +1202,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: @@ -1229,14 +1228,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'), @@ -1368,7 +1367,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}") @@ -1404,14 +1403,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'), @@ -1504,7 +1503,7 @@ def update_ai_data_platform(self, ai_data_platform_id, update_ai_data_platform_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_ai_data_platform got unknown kwargs: {extra_kwargs!r}") @@ -1513,10 +1512,10 @@ def update_ai_data_platform(self, ai_data_platform_id, update_ai_data_platform_d "aiDataPlatformId": ai_data_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 = { @@ -1525,7 +1524,7 @@ def update_ai_data_platform(self, ai_data_platform_id, update_ai_data_platform_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/ai_document/ai_service_document_client.py b/src/oci/ai_document/ai_service_document_client.py index b580551159..a5c026984c 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 @@ -183,7 +182,7 @@ def add_model_lock(self, model_id, add_model_lock_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"add_model_lock got unknown kwargs: {extra_kwargs!r}") @@ -192,16 +191,16 @@ def add_model_lock(self, model_id, add_model_lock_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') 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", @@ -210,7 +209,7 @@ def add_model_lock(self, model_id, add_model_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'), @@ -316,7 +315,7 @@ def add_project_lock(self, project_id, add_project_lock_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"add_project_lock got unknown kwargs: {extra_kwargs!r}") @@ -325,16 +324,16 @@ def add_project_lock(self, project_id, add_project_lock_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') 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", @@ -343,7 +342,7 @@ def add_project_lock(self, project_id, add_project_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'), @@ -434,7 +433,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}") @@ -445,7 +444,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'), @@ -531,7 +530,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}") @@ -540,10 +539,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 = { @@ -552,7 +551,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'), @@ -634,7 +633,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}") @@ -643,10 +642,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 = { @@ -655,7 +654,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'), @@ -744,7 +743,7 @@ def change_model_compartment(self, model_id, change_model_compartment_details, * "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_model_compartment got unknown kwargs: {extra_kwargs!r}") @@ -753,16 +752,16 @@ 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') 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", @@ -770,7 +769,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'), @@ -863,7 +862,7 @@ def change_project_compartment(self, project_id, change_project_compartment_deta "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_project_compartment got unknown kwargs: {extra_kwargs!r}") @@ -872,16 +871,16 @@ 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') 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", @@ -889,7 +888,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'), @@ -975,7 +974,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}") @@ -986,7 +985,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'), @@ -1073,7 +1072,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}") @@ -1084,7 +1083,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'), @@ -1171,7 +1170,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}") @@ -1182,7 +1181,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'), @@ -1273,7 +1272,7 @@ def delete_model(self, model_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_model got unknown kwargs: {extra_kwargs!r}") @@ -1282,16 +1281,16 @@ 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') 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", @@ -1299,7 +1298,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'), @@ -1387,7 +1386,7 @@ def delete_project(self, project_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_project got unknown kwargs: {extra_kwargs!r}") @@ -1396,16 +1395,16 @@ 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') 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", @@ -1413,7 +1412,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'), @@ -1489,7 +1488,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}") @@ -1498,10 +1497,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 = { @@ -1509,7 +1508,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'), @@ -1595,7 +1594,7 @@ def get_model_type(self, model_type, **kwargs): "model_sub_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_model_type got unknown kwargs: {extra_kwargs!r}") @@ -1604,24 +1603,24 @@ 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') query_params = { "compartmentId": kwargs.get("compartment_id", missing), "modelSubType": kwargs.get("model_sub_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'), @@ -1701,7 +1700,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}") @@ -1710,10 +1709,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 = { @@ -1721,7 +1720,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'), @@ -1799,7 +1798,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}") @@ -1808,10 +1807,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 = { @@ -1819,7 +1818,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'), @@ -1897,7 +1896,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}") @@ -1906,10 +1905,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 = { @@ -1917,7 +1916,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'), @@ -2034,7 +2033,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}") @@ -2071,14 +2070,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'), @@ -2191,7 +2190,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}") @@ -2227,14 +2226,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'), @@ -2332,7 +2331,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}") @@ -2341,10 +2340,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: @@ -2367,14 +2366,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'), @@ -2474,7 +2473,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}") @@ -2483,10 +2482,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: @@ -2509,14 +2508,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'), @@ -2631,7 +2630,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}") @@ -2667,14 +2666,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'), @@ -2763,7 +2762,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}") @@ -2772,10 +2771,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 = { @@ -2784,7 +2783,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'), @@ -2885,7 +2884,7 @@ def remove_model_lock(self, model_id, remove_model_lock_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"remove_model_lock got unknown kwargs: {extra_kwargs!r}") @@ -2894,16 +2893,16 @@ def remove_model_lock(self, model_id, remove_model_lock_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') 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", @@ -2912,7 +2911,7 @@ def remove_model_lock(self, model_id, remove_model_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'), @@ -3018,7 +3017,7 @@ def remove_project_lock(self, project_id, remove_project_lock_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"remove_project_lock got unknown kwargs: {extra_kwargs!r}") @@ -3027,16 +3026,16 @@ def remove_project_lock(self, project_id, remove_project_lock_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') 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", @@ -3045,7 +3044,7 @@ def remove_project_lock(self, project_id, remove_project_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'), @@ -3143,7 +3142,7 @@ def update_model(self, model_id, update_model_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_model got unknown kwargs: {extra_kwargs!r}") @@ -3152,16 +3151,16 @@ 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') 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", @@ -3169,7 +3168,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'), @@ -3262,7 +3261,7 @@ def update_project(self, project_id, update_project_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_project got unknown kwargs: {extra_kwargs!r}") @@ -3271,16 +3270,16 @@ 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') 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", @@ -3288,7 +3287,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 35699066cf..8928f8af1a 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 @@ -171,7 +170,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}") @@ -181,7 +180,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'), @@ -262,7 +261,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}") @@ -272,7 +271,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'), @@ -357,7 +356,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}") @@ -367,7 +366,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'), @@ -448,7 +447,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}") @@ -458,7 +457,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'), @@ -539,7 +538,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}") @@ -549,7 +548,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'), @@ -647,7 +646,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}") @@ -663,14 +662,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'), @@ -759,7 +758,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}") @@ -769,7 +768,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'), @@ -849,7 +848,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}") @@ -859,7 +858,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'), @@ -951,7 +950,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}") @@ -960,10 +959,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 = { @@ -973,7 +972,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'), @@ -1067,7 +1066,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}") @@ -1076,10 +1075,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 = { @@ -1089,7 +1088,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'), @@ -1185,7 +1184,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}") @@ -1194,10 +1193,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 = { @@ -1207,7 +1206,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'), @@ -1303,7 +1302,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}") @@ -1312,10 +1311,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 = { @@ -1325,7 +1324,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'), @@ -1421,7 +1420,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}") @@ -1430,10 +1429,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 = { @@ -1443,7 +1442,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'), @@ -1530,7 +1529,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}") @@ -1541,7 +1540,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'), @@ -1628,7 +1627,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}") @@ -1639,7 +1638,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'), @@ -1726,7 +1725,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}") @@ -1737,7 +1736,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'), @@ -1824,7 +1823,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}") @@ -1835,7 +1834,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'), @@ -1922,7 +1921,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}") @@ -1931,10 +1930,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 = { @@ -1943,7 +1942,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'), @@ -2027,7 +2026,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}") @@ -2036,10 +2035,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 = { @@ -2048,7 +2047,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'), @@ -2132,7 +2131,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}") @@ -2141,10 +2140,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 = { @@ -2153,7 +2152,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'), @@ -2237,7 +2236,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}") @@ -2246,10 +2245,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 = { @@ -2258,7 +2257,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'), @@ -2345,7 +2344,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}") @@ -2355,7 +2354,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'), @@ -2450,7 +2449,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}") @@ -2466,14 +2465,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'), @@ -2558,7 +2557,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}") @@ -2568,7 +2567,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'), @@ -2659,7 +2658,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}") @@ -2669,7 +2668,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'), @@ -2756,7 +2755,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}") @@ -2766,7 +2765,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'), @@ -2842,7 +2841,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}") @@ -2851,10 +2850,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 = { @@ -2862,7 +2861,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'), @@ -2940,7 +2939,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}") @@ -2949,10 +2948,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 = { @@ -2960,7 +2959,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'), @@ -3038,7 +3037,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}") @@ -3047,10 +3046,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 = { @@ -3058,7 +3057,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'), @@ -3136,7 +3135,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}") @@ -3145,10 +3144,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 = { @@ -3156,7 +3155,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'), @@ -3234,7 +3233,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}") @@ -3243,10 +3242,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 = { @@ -3254,7 +3253,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'), @@ -3332,7 +3331,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}") @@ -3341,10 +3340,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 = { @@ -3352,7 +3351,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'), @@ -3476,7 +3475,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}") @@ -3514,14 +3513,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'), @@ -3607,7 +3606,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}") @@ -3616,24 +3615,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'), @@ -3747,7 +3746,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}") @@ -3783,14 +3782,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'), @@ -3910,7 +3909,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}") @@ -3947,14 +3946,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'), @@ -4070,7 +4069,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}") @@ -4106,14 +4105,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'), @@ -4211,7 +4210,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}") @@ -4220,10 +4219,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: @@ -4246,14 +4245,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'), @@ -4353,7 +4352,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}") @@ -4362,10 +4361,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: @@ -4388,14 +4387,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'), @@ -4503,7 +4502,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}") @@ -4531,14 +4530,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'), @@ -4627,7 +4626,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}") @@ -4636,10 +4635,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 = { @@ -4648,7 +4647,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'), @@ -4737,7 +4736,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}") @@ -4746,10 +4745,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 = { @@ -4758,7 +4757,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'), @@ -4849,7 +4848,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}") @@ -4858,10 +4857,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 = { @@ -4870,7 +4869,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'), @@ -4959,7 +4958,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}") @@ -4968,10 +4967,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 = { @@ -4980,7 +4979,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 63ed29fc3d..5b371b9569 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 @@ -176,7 +175,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}") @@ -185,10 +184,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 = { @@ -198,7 +197,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'), @@ -292,7 +291,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}") @@ -302,10 +301,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 = { @@ -315,7 +314,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'), @@ -409,7 +408,7 @@ def change_customization_compartment(self, customization_id, change_customizatio "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_customization_compartment got unknown kwargs: {extra_kwargs!r}") @@ -418,10 +417,10 @@ def change_customization_compartment(self, customization_id, change_customizatio "customizationId": customization_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -431,7 +430,7 @@ def change_customization_compartment(self, customization_id, change_customizatio "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -536,10 +535,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 = { @@ -549,7 +548,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'), @@ -634,7 +633,7 @@ def create_customization(self, create_customization_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_customization got unknown kwargs: {extra_kwargs!r}") @@ -645,7 +644,7 @@ def create_customization(self, create_customization_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_realtime_session_token(self, create_realtime_session_token_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_realtime_session_token got unknown kwargs: {extra_kwargs!r}") @@ -741,7 +740,7 @@ def create_realtime_session_token(self, create_realtime_session_token_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'), @@ -826,7 +825,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}") @@ -837,7 +836,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'), @@ -930,7 +929,7 @@ def delete_customization(self, customization_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_customization got unknown kwargs: {extra_kwargs!r}") @@ -939,10 +938,10 @@ def delete_customization(self, customization_id, **kwargs): "customizationId": customization_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 delete_customization(self, customization_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 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}") @@ -1052,10 +1051,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 = { @@ -1065,7 +1064,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'), @@ -1140,7 +1139,7 @@ def get_customization(self, customization_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_customization got unknown kwargs: {extra_kwargs!r}") @@ -1149,10 +1148,10 @@ def get_customization(self, customization_id, **kwargs): "customizationId": customization_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1160,7 +1159,7 @@ def get_customization(self, customization_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_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}") @@ -1245,10 +1244,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 = { @@ -1256,7 +1255,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'), @@ -1335,7 +1334,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}") @@ -1345,10 +1344,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 = { @@ -1356,7 +1355,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'), @@ -1467,7 +1466,7 @@ def list_customizations(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_customizations got unknown kwargs: {extra_kwargs!r}") @@ -1503,14 +1502,14 @@ def list_customizations(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'), @@ -1621,7 +1620,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}") @@ -1657,14 +1656,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'), @@ -1774,7 +1773,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}") @@ -1783,10 +1782,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: @@ -1819,14 +1818,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'), @@ -1919,7 +1918,7 @@ def list_voices(self, **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_voices got unknown kwargs: {extra_kwargs!r}") @@ -1937,14 +1936,14 @@ def list_voices(self, **kwargs): "languageCode": kwargs.get("language_code", 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'), @@ -2020,7 +2019,7 @@ def synthesize_speech(self, synthesize_speech_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"synthesize_speech got unknown kwargs: {extra_kwargs!r}") @@ -2030,7 +2029,7 @@ def synthesize_speech(self, synthesize_speech_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'), @@ -2117,7 +2116,7 @@ def update_customization(self, customization_id, update_customization_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_customization got unknown kwargs: {extra_kwargs!r}") @@ -2126,10 +2125,10 @@ def update_customization(self, customization_id, update_customization_details, * "customizationId": customization_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 update_customization(self, customization_id, update_customization_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'), @@ -2227,7 +2226,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}") @@ -2236,10 +2235,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 = { @@ -2248,7 +2247,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 da21515efa..e5cf661216 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 @@ -160,7 +159,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}") @@ -170,7 +169,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'), @@ -248,7 +247,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}") @@ -258,7 +257,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'), @@ -344,7 +343,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}") @@ -353,10 +352,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 = { @@ -365,7 +364,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'), @@ -447,7 +446,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}") @@ -456,10 +455,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 = { @@ -468,7 +467,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'), @@ -550,7 +549,7 @@ def cancel_video_job(self, video_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_video_job got unknown kwargs: {extra_kwargs!r}") @@ -559,10 +558,10 @@ def cancel_video_job(self, video_job_id, **kwargs): "videoJobId": video_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 = { @@ -571,7 +570,7 @@ def cancel_video_job(self, video_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'), @@ -653,7 +652,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}") @@ -662,10 +661,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 = { @@ -674,7 +673,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'), @@ -759,7 +758,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}") @@ -768,10 +767,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 = { @@ -780,7 +779,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'), @@ -867,7 +866,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}") @@ -876,10 +875,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 = { @@ -888,7 +887,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'), @@ -983,7 +982,7 @@ def change_stream_group_compartment(self, stream_group_id, change_stream_group_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_stream_group_compartment got unknown kwargs: {extra_kwargs!r}") @@ -992,10 +991,10 @@ def change_stream_group_compartment(self, stream_group_id, change_stream_group_c "streamGroupId": stream_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 = { @@ -1005,7 +1004,7 @@ def change_stream_group_compartment(self, stream_group_id, change_stream_group_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'), @@ -1103,7 +1102,7 @@ def change_stream_job_compartment(self, stream_job_id, change_stream_job_compart "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_job_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1112,10 +1111,10 @@ def change_stream_job_compartment(self, stream_job_id, change_stream_job_compart "streamJobId": stream_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 = { @@ -1125,7 +1124,7 @@ def change_stream_job_compartment(self, stream_job_id, change_stream_job_compart "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1223,7 +1222,7 @@ def change_stream_source_compartment(self, stream_source_id, change_stream_sourc "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_source_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1232,10 +1231,10 @@ def change_stream_source_compartment(self, stream_source_id, change_stream_sourc "streamSourceId": stream_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 = { @@ -1245,7 +1244,7 @@ def change_stream_source_compartment(self, stream_source_id, change_stream_sourc "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1343,7 +1342,7 @@ def change_vision_private_endpoint_compartment(self, vision_private_endpoint_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"change_vision_private_endpoint_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1352,10 +1351,10 @@ def change_vision_private_endpoint_compartment(self, vision_private_endpoint_id, "visionPrivateEndpointId": vision_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 = { @@ -1365,7 +1364,7 @@ def change_vision_private_endpoint_compartment(self, vision_private_endpoint_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'), @@ -1452,7 +1451,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}") @@ -1463,7 +1462,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'), @@ -1548,7 +1547,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}") @@ -1559,7 +1558,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'), @@ -1644,7 +1643,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}") @@ -1655,7 +1654,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'), @@ -1740,7 +1739,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}") @@ -1751,7 +1750,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'), @@ -1836,7 +1835,7 @@ def create_stream_group(self, create_stream_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_stream_group got unknown kwargs: {extra_kwargs!r}") @@ -1847,7 +1846,7 @@ def create_stream_group(self, create_stream_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'), @@ -1934,7 +1933,7 @@ def create_stream_job(self, create_stream_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_stream_job got unknown kwargs: {extra_kwargs!r}") @@ -1945,7 +1944,7 @@ def create_stream_job(self, create_stream_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'), @@ -2032,7 +2031,7 @@ def create_stream_source(self, create_stream_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_stream_source got unknown kwargs: {extra_kwargs!r}") @@ -2043,7 +2042,7 @@ def create_stream_source(self, create_stream_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'), @@ -2130,7 +2129,7 @@ def create_video_job(self, create_video_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_video_job got unknown kwargs: {extra_kwargs!r}") @@ -2141,7 +2140,7 @@ def create_video_job(self, create_video_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'), @@ -2226,7 +2225,7 @@ def create_vision_private_endpoint(self, create_vision_private_endpoint_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_vision_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -2237,7 +2236,7 @@ def create_vision_private_endpoint(self, create_vision_private_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'), @@ -2324,7 +2323,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}") @@ -2333,10 +2332,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 = { @@ -2345,7 +2344,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'), @@ -2427,7 +2426,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}") @@ -2436,10 +2435,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 = { @@ -2448,7 +2447,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'), @@ -2530,7 +2529,7 @@ def delete_stream_group(self, stream_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_stream_group got unknown kwargs: {extra_kwargs!r}") @@ -2539,10 +2538,10 @@ def delete_stream_group(self, stream_group_id, **kwargs): "streamGroupId": stream_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 = { @@ -2551,7 +2550,7 @@ def delete_stream_group(self, stream_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'), @@ -2633,7 +2632,7 @@ def delete_stream_job(self, stream_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_stream_job got unknown kwargs: {extra_kwargs!r}") @@ -2642,10 +2641,10 @@ def delete_stream_job(self, stream_job_id, **kwargs): "streamJobId": stream_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 = { @@ -2654,7 +2653,7 @@ def delete_stream_job(self, stream_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'), @@ -2736,7 +2735,7 @@ def delete_stream_source(self, stream_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_stream_source got unknown kwargs: {extra_kwargs!r}") @@ -2745,10 +2744,10 @@ def delete_stream_source(self, stream_source_id, **kwargs): "streamSourceId": stream_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 = { @@ -2757,7 +2756,7 @@ def delete_stream_source(self, stream_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'), @@ -2839,7 +2838,7 @@ def delete_vision_private_endpoint(self, vision_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_vision_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -2848,10 +2847,10 @@ def delete_vision_private_endpoint(self, vision_private_endpoint_id, **kwargs): "visionPrivateEndpointId": vision_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 = { @@ -2860,7 +2859,7 @@ def delete_vision_private_endpoint(self, vision_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'), @@ -2934,7 +2933,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}") @@ -2943,10 +2942,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 = { @@ -2954,7 +2953,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'), @@ -3030,7 +3029,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}") @@ -3039,10 +3038,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 = { @@ -3050,7 +3049,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'), @@ -3126,7 +3125,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}") @@ -3135,10 +3134,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 = { @@ -3146,7 +3145,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'), @@ -3222,7 +3221,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}") @@ -3231,10 +3230,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 = { @@ -3242,7 +3241,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'), @@ -3318,7 +3317,7 @@ def get_stream_group(self, stream_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_stream_group got unknown kwargs: {extra_kwargs!r}") @@ -3327,10 +3326,10 @@ def get_stream_group(self, stream_group_id, **kwargs): "streamGroupId": stream_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 = { @@ -3338,7 +3337,7 @@ def get_stream_group(self, stream_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'), @@ -3416,7 +3415,7 @@ def get_stream_job(self, stream_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_stream_job got unknown kwargs: {extra_kwargs!r}") @@ -3425,10 +3424,10 @@ def get_stream_job(self, stream_job_id, **kwargs): "streamJobId": stream_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 = { @@ -3436,7 +3435,7 @@ def get_stream_job(self, stream_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'), @@ -3514,7 +3513,7 @@ def get_stream_source(self, stream_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_stream_source got unknown kwargs: {extra_kwargs!r}") @@ -3523,10 +3522,10 @@ def get_stream_source(self, stream_source_id, **kwargs): "streamSourceId": stream_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 = { @@ -3534,7 +3533,7 @@ def get_stream_source(self, stream_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'), @@ -3612,7 +3611,7 @@ def get_video_job(self, video_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_video_job got unknown kwargs: {extra_kwargs!r}") @@ -3621,10 +3620,10 @@ def get_video_job(self, video_job_id, **kwargs): "videoJobId": video_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 = { @@ -3632,7 +3631,7 @@ def get_video_job(self, video_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'), @@ -3708,7 +3707,7 @@ def get_vision_private_endpoint(self, vision_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_vision_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -3717,10 +3716,10 @@ def get_vision_private_endpoint(self, vision_private_endpoint_id, **kwargs): "visionPrivateEndpointId": vision_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 = { @@ -3728,7 +3727,7 @@ def get_vision_private_endpoint(self, vision_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'), @@ -3806,7 +3805,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}") @@ -3815,10 +3814,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 = { @@ -3826,7 +3825,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'), @@ -3941,7 +3940,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}") @@ -3978,14 +3977,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'), @@ -4096,7 +4095,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}") @@ -4132,14 +4131,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'), @@ -4244,7 +4243,7 @@ def list_stream_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_stream_groups got unknown kwargs: {extra_kwargs!r}") @@ -4272,14 +4271,14 @@ def list_stream_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'), @@ -4392,7 +4391,7 @@ def list_stream_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_stream_jobs got unknown kwargs: {extra_kwargs!r}") @@ -4428,14 +4427,14 @@ def list_stream_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'), @@ -4548,7 +4547,7 @@ def list_stream_sources(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_stream_sources got unknown kwargs: {extra_kwargs!r}") @@ -4584,14 +4583,14 @@ def list_stream_sources(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'), @@ -4704,7 +4703,7 @@ def list_vision_private_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_vision_private_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -4740,14 +4739,14 @@ def list_vision_private_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'), @@ -4845,7 +4844,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}") @@ -4854,10 +4853,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: @@ -4880,14 +4879,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'), @@ -4985,7 +4984,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}") @@ -4994,10 +4993,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: @@ -5020,14 +5019,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'), @@ -5140,7 +5139,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}") @@ -5176,14 +5175,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'), @@ -5275,7 +5274,7 @@ def start_stream_job(self, stream_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"start_stream_job got unknown kwargs: {extra_kwargs!r}") @@ -5284,10 +5283,10 @@ def start_stream_job(self, stream_job_id, **kwargs): "streamJobId": stream_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 = { @@ -5297,7 +5296,7 @@ def start_stream_job(self, stream_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'), @@ -5390,7 +5389,7 @@ def stop_stream_job(self, stream_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"stop_stream_job got unknown kwargs: {extra_kwargs!r}") @@ -5399,10 +5398,10 @@ def stop_stream_job(self, stream_job_id, **kwargs): "streamJobId": stream_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 = { @@ -5412,7 +5411,7 @@ def stop_stream_job(self, stream_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'), @@ -5500,7 +5499,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}") @@ -5509,10 +5508,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 = { @@ -5521,7 +5520,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'), @@ -5608,7 +5607,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}") @@ -5617,10 +5616,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 = { @@ -5629,7 +5628,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'), @@ -5716,7 +5715,7 @@ def update_stream_group(self, stream_group_id, update_stream_group_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_stream_group got unknown kwargs: {extra_kwargs!r}") @@ -5725,10 +5724,10 @@ def update_stream_group(self, stream_group_id, update_stream_group_details, **kw "streamGroupId": stream_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 = { @@ -5737,7 +5736,7 @@ def update_stream_group(self, stream_group_id, update_stream_group_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'), @@ -5824,7 +5823,7 @@ def update_stream_job(self, update_stream_job_details, stream_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"update_stream_job got unknown kwargs: {extra_kwargs!r}") @@ -5833,10 +5832,10 @@ def update_stream_job(self, update_stream_job_details, stream_job_id, **kwargs): "streamJobId": stream_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 = { @@ -5845,7 +5844,7 @@ def update_stream_job(self, update_stream_job_details, stream_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'), @@ -5932,7 +5931,7 @@ def update_stream_source(self, stream_source_id, update_stream_source_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_stream_source got unknown kwargs: {extra_kwargs!r}") @@ -5941,10 +5940,10 @@ def update_stream_source(self, stream_source_id, update_stream_source_details, * "streamSourceId": stream_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 = { @@ -5953,7 +5952,7 @@ def update_stream_source(self, stream_source_id, update_stream_source_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'), @@ -6040,7 +6039,7 @@ def update_vision_private_endpoint(self, vision_private_endpoint_id, update_visi "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_vision_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -6049,10 +6048,10 @@ def update_vision_private_endpoint(self, vision_private_endpoint_id, update_visi "visionPrivateEndpointId": vision_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 = { @@ -6061,7 +6060,7 @@ def update_vision_private_endpoint(self, vision_private_endpoint_id, update_visi "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 9831c26b59..bf07569e1f 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 @@ -179,7 +178,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}") @@ -188,10 +187,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 = { @@ -201,7 +200,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'), @@ -299,7 +298,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}") @@ -308,10 +307,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 = { @@ -321,7 +320,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'), @@ -410,7 +409,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}") @@ -421,7 +420,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'), @@ -513,7 +512,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}") @@ -522,10 +521,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 = { @@ -534,7 +533,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'), @@ -626,7 +625,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}") @@ -635,10 +634,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 = { @@ -647,7 +646,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'), @@ -742,7 +741,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}") @@ -751,10 +750,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 = { @@ -764,7 +763,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'), @@ -859,7 +858,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}") @@ -869,10 +868,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 = { @@ -882,7 +881,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'), @@ -977,7 +976,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}") @@ -987,10 +986,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 = { @@ -1000,7 +999,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'), @@ -1084,7 +1083,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}") @@ -1093,10 +1092,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 = { @@ -1105,7 +1104,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'), @@ -1180,7 +1179,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}") @@ -1189,10 +1188,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 = { @@ -1200,7 +1199,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'), @@ -1282,7 +1281,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}") @@ -1292,10 +1291,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 = { @@ -1303,7 +1302,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'), @@ -1382,7 +1381,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}") @@ -1391,10 +1390,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 = { @@ -1402,7 +1401,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'), @@ -1537,7 +1536,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}") @@ -1588,14 +1587,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'), @@ -1692,7 +1691,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}") @@ -1701,24 +1700,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'), @@ -1817,7 +1816,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}") @@ -1826,24 +1825,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'), @@ -1970,7 +1969,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}") @@ -2014,14 +2013,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'), @@ -2118,7 +2117,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}") @@ -2127,10 +2126,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 = { @@ -2140,7 +2139,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'), @@ -2237,7 +2236,7 @@ def set_feature_bundle(self, analytics_instance_id, set_feature_bundle_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"set_feature_bundle got unknown kwargs: {extra_kwargs!r}") @@ -2246,10 +2245,10 @@ def set_feature_bundle(self, analytics_instance_id, set_feature_bundle_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 = { @@ -2259,7 +2258,7 @@ def set_feature_bundle(self, analytics_instance_id, set_feature_bundle_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'), @@ -2356,7 +2355,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}") @@ -2365,10 +2364,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 = { @@ -2378,7 +2377,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'), @@ -2473,7 +2472,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}") @@ -2482,10 +2481,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 = { @@ -2495,7 +2494,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'), @@ -2588,7 +2587,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}") @@ -2597,10 +2596,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 = { @@ -2610,7 +2609,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'), @@ -2699,7 +2698,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}") @@ -2708,10 +2707,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 = { @@ -2720,7 +2719,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'), @@ -2819,7 +2818,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}") @@ -2829,10 +2828,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 = { @@ -2842,7 +2841,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'), @@ -2942,7 +2941,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}") @@ -2952,10 +2951,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 = { @@ -2965,7 +2964,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 ec79b1dddb..f693254edd 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 @@ -163,7 +162,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}") @@ -172,10 +171,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 = { @@ -183,7 +182,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_compartment(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_compartment got unknown kwargs: {extra_kwargs!r}") @@ -269,10 +268,10 @@ def get_announcement_compartment(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_compartment(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'), @@ -359,7 +358,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}") @@ -368,10 +367,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 = { @@ -379,7 +378,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'), @@ -526,7 +525,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}") @@ -577,14 +576,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'), @@ -670,7 +669,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}") @@ -679,10 +678,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 = { @@ -691,7 +690,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 a066334eee..f9603f293e 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 @@ -170,7 +169,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}") @@ -179,10 +178,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 = { @@ -191,7 +190,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'), @@ -278,7 +277,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}") @@ -289,7 +288,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'), @@ -384,7 +383,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}") @@ -393,10 +392,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 = { @@ -406,7 +405,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'), @@ -492,7 +491,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}") @@ -501,10 +500,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 = { @@ -513,7 +512,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'), @@ -597,7 +596,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}") @@ -607,10 +606,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 = { @@ -619,7 +618,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'), @@ -696,7 +695,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}") @@ -705,10 +704,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 = { @@ -716,7 +715,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'), @@ -829,7 +828,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}") @@ -865,14 +864,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'), @@ -958,7 +957,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}") @@ -967,10 +966,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 = { @@ -979,7 +978,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'), @@ -1070,7 +1069,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}") @@ -1080,10 +1079,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 = { @@ -1092,7 +1091,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 3f208a9c00..7e4d826884 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 @@ -167,7 +166,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}") @@ -178,7 +177,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'), @@ -258,7 +257,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}") @@ -267,10 +266,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 = { @@ -278,7 +277,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'), @@ -365,7 +364,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}") @@ -375,14 +374,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'), @@ -468,7 +467,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}") @@ -477,10 +476,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 = { @@ -489,7 +488,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/announcements_service/service_client.py b/src/oci/announcements_service/service_client.py index f914acdbef..cf7bf4bf7b 100644 --- a/src/oci/announcements_service/service_client.py +++ b/src/oci/announcements_service/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 @@ -193,7 +192,7 @@ def list_services(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_services got unknown kwargs: {extra_kwargs!r}") @@ -235,14 +234,14 @@ def list_services(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'), diff --git a/src/oci/api_platform/api_platform_client.py b/src/oci/api_platform/api_platform_client.py index 6b32003a37..a7dd6a683a 100644 --- a/src/oci/api_platform/api_platform_client.py +++ b/src/oci/api_platform/api_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 @@ -186,7 +185,7 @@ def change_api_platform_instance_compartment(self, api_platform_instance_id, cha "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_platform_instance_compartment got unknown kwargs: {extra_kwargs!r}") @@ -195,10 +194,10 @@ def change_api_platform_instance_compartment(self, api_platform_instance_id, cha "apiPlatformInstanceId": api_platform_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 = { @@ -208,7 +207,7 @@ def change_api_platform_instance_compartment(self, api_platform_instance_id, cha "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 create_api_platform_instance(self, create_api_platform_instance_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_api_platform_instance got unknown kwargs: {extra_kwargs!r}") @@ -309,7 +308,7 @@ def create_api_platform_instance(self, create_api_platform_instance_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'), @@ -400,7 +399,7 @@ def delete_api_platform_instance(self, api_platform_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_api_platform_instance got unknown kwargs: {extra_kwargs!r}") @@ -409,10 +408,10 @@ def delete_api_platform_instance(self, api_platform_instance_id, **kwargs): "apiPlatformInstanceId": api_platform_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 = { @@ -421,7 +420,7 @@ def delete_api_platform_instance(self, api_platform_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'), @@ -502,7 +501,7 @@ def get_api_platform_instance(self, api_platform_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_api_platform_instance got unknown kwargs: {extra_kwargs!r}") @@ -511,10 +510,10 @@ def get_api_platform_instance(self, api_platform_instance_id, **kwargs): "apiPlatformInstanceId": api_platform_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 = { @@ -522,7 +521,7 @@ def get_api_platform_instance(self, api_platform_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'), @@ -605,7 +604,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}") @@ -614,10 +613,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 = { @@ -625,7 +624,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'), @@ -755,7 +754,7 @@ def list_api_platform_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_api_platform_instances got unknown kwargs: {extra_kwargs!r}") @@ -791,14 +790,14 @@ def list_api_platform_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'), @@ -909,7 +908,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}") @@ -918,10 +917,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: @@ -944,14 +943,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'), @@ -1064,7 +1063,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}") @@ -1073,10 +1072,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: @@ -1099,14 +1098,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'), @@ -1238,7 +1237,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}") @@ -1274,14 +1273,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 update_api_platform_instance(self, api_platform_instance_id, update_api_plat "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_platform_instance got unknown kwargs: {extra_kwargs!r}") @@ -1383,10 +1382,10 @@ def update_api_platform_instance(self, api_platform_instance_id, update_api_plat "apiPlatformInstanceId": api_platform_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 update_api_platform_instance(self, api_platform_instance_id, update_api_plat "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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/apiaccesscontrol/api_metadata_client.py b/src/oci/apiaccesscontrol/api_metadata_client.py index 192cc04b6f..e60eb6381f 100644 --- a/src/oci/apiaccesscontrol/api_metadata_client.py +++ b/src/oci/apiaccesscontrol/api_metadata_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_api_metadata(self, api_metadata_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_metadata got unknown kwargs: {extra_kwargs!r}") @@ -179,10 +178,10 @@ def get_api_metadata(self, api_metadata_id, **kwargs): "apiMetadataId": api_metadata_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 get_api_metadata(self, api_metadata_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -318,7 +317,7 @@ def list_api_metadata(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_api_metadata got unknown kwargs: {extra_kwargs!r}") @@ -354,14 +353,14 @@ def list_api_metadata(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'), @@ -489,7 +488,7 @@ def list_api_metadata_by_entity_types(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_api_metadata_by_entity_types got unknown kwargs: {extra_kwargs!r}") @@ -525,14 +524,14 @@ def list_api_metadata_by_entity_types(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/apiaccesscontrol/privileged_api_control_client.py b/src/oci/apiaccesscontrol/privileged_api_control_client.py index a3b2e480b2..36af1ab3a1 100644 --- a/src/oci/apiaccesscontrol/privileged_api_control_client.py +++ b/src/oci/apiaccesscontrol/privileged_api_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 @@ -191,7 +190,7 @@ def change_privileged_api_control_compartment(self, privileged_api_control_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_privileged_api_control_compartment got unknown kwargs: {extra_kwargs!r}") @@ -200,10 +199,10 @@ def change_privileged_api_control_compartment(self, privileged_api_control_id, c "privilegedApiControlId": privileged_api_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 = { @@ -213,7 +212,7 @@ def change_privileged_api_control_compartment(self, privileged_api_control_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'), @@ -303,7 +302,7 @@ def create_privileged_api_control(self, create_privileged_api_control_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_privileged_api_control got unknown kwargs: {extra_kwargs!r}") @@ -314,7 +313,7 @@ def create_privileged_api_control(self, create_privileged_api_control_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'), @@ -409,7 +408,7 @@ def delete_privileged_api_control(self, privileged_api_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_privileged_api_control got unknown kwargs: {extra_kwargs!r}") @@ -418,16 +417,16 @@ def delete_privileged_api_control(self, privileged_api_control_id, **kwargs): "privilegedApiControlId": privileged_api_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", @@ -435,7 +434,7 @@ def delete_privileged_api_control(self, privileged_api_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'), @@ -518,7 +517,7 @@ def get_privileged_api_control(self, privileged_api_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_privileged_api_control got unknown kwargs: {extra_kwargs!r}") @@ -527,10 +526,10 @@ def get_privileged_api_control(self, privileged_api_control_id, **kwargs): "privilegedApiControlId": privileged_api_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 = { @@ -538,7 +537,7 @@ def get_privileged_api_control(self, privileged_api_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'), @@ -672,7 +671,7 @@ def list_privileged_api_controls(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_privileged_api_controls got unknown kwargs: {extra_kwargs!r}") @@ -709,14 +708,14 @@ def list_privileged_api_controls(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'), @@ -809,7 +808,7 @@ def update_privileged_api_control(self, privileged_api_control_id, update_privil "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_privileged_api_control got unknown kwargs: {extra_kwargs!r}") @@ -818,10 +817,10 @@ def update_privileged_api_control(self, privileged_api_control_id, update_privil "privilegedApiControlId": privileged_api_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 = { @@ -830,7 +829,7 @@ def update_privileged_api_control(self, privileged_api_control_id, update_privil "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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/apiaccesscontrol/privileged_api_requests_client.py b/src/oci/apiaccesscontrol/privileged_api_requests_client.py index 5a80fb3c8f..0fce2835a3 100644 --- a/src/oci/apiaccesscontrol/privileged_api_requests_client.py +++ b/src/oci/apiaccesscontrol/privileged_api_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 @@ -186,7 +185,7 @@ def approve_privileged_api_request(self, privileged_api_request_id, approve_priv "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_privileged_api_request got unknown kwargs: {extra_kwargs!r}") @@ -195,10 +194,10 @@ def approve_privileged_api_request(self, privileged_api_request_id, approve_priv "privilegedApiRequestId": privileged_api_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 approve_privileged_api_request(self, privileged_api_request_id, approve_priv "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 close_privileged_api_request(self, privileged_api_request_id, close_privileg "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"close_privileged_api_request got unknown kwargs: {extra_kwargs!r}") @@ -317,10 +316,10 @@ def close_privileged_api_request(self, privileged_api_request_id, close_privileg "privilegedApiRequestId": privileged_api_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 close_privileged_api_request(self, privileged_api_request_id, close_privileg "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_privileged_api_request(self, create_privileged_api_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"create_privileged_api_request got unknown kwargs: {extra_kwargs!r}") @@ -431,7 +430,7 @@ def create_privileged_api_request(self, create_privileged_api_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'), @@ -513,7 +512,7 @@ def get_privileged_api_request(self, privileged_api_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_privileged_api_request got unknown kwargs: {extra_kwargs!r}") @@ -522,10 +521,10 @@ def get_privileged_api_request(self, privileged_api_request_id, **kwargs): "privilegedApiRequestId": privileged_api_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 get_privileged_api_request(self, privileged_api_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'), @@ -680,7 +679,7 @@ def list_privileged_api_requests(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_privileged_api_requests got unknown kwargs: {extra_kwargs!r}") @@ -726,14 +725,14 @@ def list_privileged_api_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'), @@ -832,7 +831,7 @@ def reject_privileged_api_request(self, privileged_api_request_id, reject_privil "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_privileged_api_request got unknown kwargs: {extra_kwargs!r}") @@ -841,10 +840,10 @@ def reject_privileged_api_request(self, privileged_api_request_id, reject_privil "privilegedApiRequestId": privileged_api_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 reject_privileged_api_request(self, privileged_api_request_id, reject_privil "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 revoke_privileged_api_request(self, privileged_api_request_id, revoke_privil "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_privileged_api_request got unknown kwargs: {extra_kwargs!r}") @@ -963,10 +962,10 @@ def revoke_privileged_api_request(self, privileged_api_request_id, revoke_privil "privilegedApiRequestId": privileged_api_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 revoke_privileged_api_request(self, privileged_api_request_id, revoke_privil "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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/apiaccesscontrol/privileged_api_work_request_client.py b/src/oci/apiaccesscontrol/privileged_api_work_request_client.py index aa4d8f8d8d..e2f83ba44c 100644 --- a/src/oci/apiaccesscontrol/privileged_api_work_request_client.py +++ b/src/oci/apiaccesscontrol/privileged_api_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 @@ -177,7 +176,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}") @@ -186,10 +185,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'), @@ -279,7 +278,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}") @@ -288,10 +287,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 = { @@ -299,7 +298,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'), @@ -410,7 +409,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}") @@ -419,10 +418,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: @@ -445,14 +444,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'), @@ -565,7 +564,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}") @@ -574,10 +573,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: @@ -600,14 +599,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'), @@ -739,7 +738,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}") @@ -775,14 +774,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/apigateway/api_gateway_client.py b/src/oci/apigateway/api_gateway_client.py index 56d518f4b9..1ba16f0bdf 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 @@ -172,7 +171,7 @@ def add_api_lock(self, api_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_api_lock got unknown kwargs: {extra_kwargs!r}") @@ -181,10 +180,10 @@ def add_api_lock(self, api_id, add_resource_lock_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 = { @@ -193,7 +192,7 @@ def add_api_lock(self, api_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'), @@ -281,7 +280,7 @@ def add_certificate_lock(self, certificate_id, add_resource_lock_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"add_certificate_lock got unknown kwargs: {extra_kwargs!r}") @@ -290,10 +289,10 @@ def add_certificate_lock(self, certificate_id, add_resource_lock_details, **kwar "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 = { @@ -302,7 +301,7 @@ def add_certificate_lock(self, certificate_id, add_resource_lock_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'), @@ -390,7 +389,7 @@ def add_sdk_lock(self, sdk_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_sdk_lock got unknown kwargs: {extra_kwargs!r}") @@ -399,10 +398,10 @@ def add_sdk_lock(self, sdk_id, add_resource_lock_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 = { @@ -411,7 +410,7 @@ def add_sdk_lock(self, sdk_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'), @@ -512,7 +511,7 @@ def change_api_compartment(self, api_id, change_api_compartment_details, **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"change_api_compartment got unknown kwargs: {extra_kwargs!r}") @@ -521,16 +520,16 @@ 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') 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", @@ -539,7 +538,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'), @@ -641,7 +640,7 @@ def change_certificate_compartment(self, certificate_id, change_certificate_comp "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_certificate_compartment got unknown kwargs: {extra_kwargs!r}") @@ -650,16 +649,16 @@ 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') 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", @@ -668,7 +667,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'), @@ -755,7 +754,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}") @@ -766,7 +765,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'), @@ -853,7 +852,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}") @@ -864,7 +863,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'), @@ -951,7 +950,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}") @@ -962,7 +961,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'), @@ -1053,7 +1052,7 @@ def delete_api(self, api_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_api got unknown kwargs: {extra_kwargs!r}") @@ -1062,16 +1061,16 @@ 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') 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", @@ -1079,7 +1078,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'), @@ -1167,7 +1166,7 @@ def delete_certificate(self, certificate_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_certificate got unknown kwargs: {extra_kwargs!r}") @@ -1176,16 +1175,16 @@ 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') 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", @@ -1193,7 +1192,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'), @@ -1281,7 +1280,7 @@ def delete_sdk(self, sdk_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_sdk got unknown kwargs: {extra_kwargs!r}") @@ -1290,16 +1289,16 @@ 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') 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", @@ -1307,7 +1306,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'), @@ -1383,7 +1382,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}") @@ -1392,10 +1391,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 = { @@ -1403,7 +1402,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'), @@ -1497,7 +1496,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}") @@ -1506,10 +1505,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 = { @@ -1519,7 +1518,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'), @@ -1605,7 +1604,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}") @@ -1614,10 +1613,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 = { @@ -1626,7 +1625,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'), @@ -1712,7 +1711,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}") @@ -1721,10 +1720,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 = { @@ -1733,7 +1732,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'), @@ -1811,7 +1810,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}") @@ -1820,10 +1819,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 = { @@ -1831,7 +1830,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'), @@ -1909,7 +1908,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}") @@ -1918,10 +1917,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 = { @@ -1929,7 +1928,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'), @@ -2044,7 +2043,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}") @@ -2079,14 +2078,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'), @@ -2201,7 +2200,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}") @@ -2236,14 +2235,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'), @@ -2350,7 +2349,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}") @@ -2377,14 +2376,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'), @@ -2504,7 +2503,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}") @@ -2540,14 +2539,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'), @@ -2635,7 +2634,7 @@ def remove_api_lock(self, api_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_api_lock got unknown kwargs: {extra_kwargs!r}") @@ -2644,10 +2643,10 @@ def remove_api_lock(self, api_id, remove_resource_lock_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 = { @@ -2656,7 +2655,7 @@ def remove_api_lock(self, api_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'), @@ -2744,7 +2743,7 @@ def remove_certificate_lock(self, certificate_id, remove_resource_lock_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"remove_certificate_lock got unknown kwargs: {extra_kwargs!r}") @@ -2753,10 +2752,10 @@ def remove_certificate_lock(self, certificate_id, remove_resource_lock_details, "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 = { @@ -2765,7 +2764,7 @@ def remove_certificate_lock(self, certificate_id, remove_resource_lock_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'), @@ -2853,7 +2852,7 @@ def remove_sdk_lock(self, sdk_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_sdk_lock got unknown kwargs: {extra_kwargs!r}") @@ -2862,10 +2861,10 @@ def remove_sdk_lock(self, sdk_id, remove_resource_lock_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 = { @@ -2874,7 +2873,7 @@ def remove_sdk_lock(self, sdk_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'), @@ -2967,7 +2966,7 @@ def update_api(self, api_id, update_api_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_api got unknown kwargs: {extra_kwargs!r}") @@ -2976,16 +2975,16 @@ 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') 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", @@ -2993,7 +2992,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'), @@ -3086,7 +3085,7 @@ def update_certificate(self, certificate_id, update_certificate_details, **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"update_certificate got unknown kwargs: {extra_kwargs!r}") @@ -3095,16 +3094,16 @@ 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') 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 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'), @@ -3205,7 +3204,7 @@ def update_sdk(self, sdk_id, update_sdk_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_sdk got unknown kwargs: {extra_kwargs!r}") @@ -3214,16 +3213,16 @@ 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') 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", @@ -3231,7 +3230,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 53d9d3cac4..84814f2111 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 @@ -172,7 +171,7 @@ def add_deployment_lock(self, deployment_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_deployment_lock got unknown kwargs: {extra_kwargs!r}") @@ -181,10 +180,10 @@ def add_deployment_lock(self, deployment_id, add_resource_lock_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 = { @@ -193,7 +192,7 @@ def add_deployment_lock(self, deployment_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'), @@ -294,7 +293,7 @@ def change_deployment_compartment(self, deployment_id, change_deployment_compart "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_deployment_compartment got unknown kwargs: {extra_kwargs!r}") @@ -303,16 +302,16 @@ 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') 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", @@ -321,7 +320,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'), @@ -408,7 +407,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}") @@ -419,7 +418,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'), @@ -510,7 +509,7 @@ def delete_deployment(self, deployment_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_deployment got unknown kwargs: {extra_kwargs!r}") @@ -519,16 +518,16 @@ 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') 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", @@ -536,7 +535,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'), @@ -612,7 +611,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}") @@ -621,10 +620,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 = { @@ -632,7 +631,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'), @@ -751,7 +750,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}") @@ -787,14 +786,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'), @@ -882,7 +881,7 @@ def remove_deployment_lock(self, deployment_id, remove_resource_lock_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"remove_deployment_lock got unknown kwargs: {extra_kwargs!r}") @@ -891,10 +890,10 @@ def remove_deployment_lock(self, deployment_id, remove_resource_lock_details, ** "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 = { @@ -903,7 +902,7 @@ def remove_deployment_lock(self, deployment_id, remove_resource_lock_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'), @@ -996,7 +995,7 @@ def update_deployment(self, deployment_id, update_deployment_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_deployment got unknown kwargs: {extra_kwargs!r}") @@ -1005,16 +1004,16 @@ 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') 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", @@ -1022,7 +1021,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 2748dfef7c..a32ca8a01c 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 @@ -172,7 +171,7 @@ def add_gateway_lock(self, gateway_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_gateway_lock got unknown kwargs: {extra_kwargs!r}") @@ -181,10 +180,10 @@ def add_gateway_lock(self, gateway_id, add_resource_lock_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 = { @@ -193,7 +192,7 @@ def add_gateway_lock(self, gateway_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'), @@ -294,7 +293,7 @@ def change_gateway_compartment(self, gateway_id, change_gateway_compartment_deta "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_gateway_compartment got unknown kwargs: {extra_kwargs!r}") @@ -303,16 +302,16 @@ 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') 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", @@ -321,7 +320,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'), @@ -408,7 +407,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}") @@ -419,7 +418,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'), @@ -510,7 +509,7 @@ def delete_gateway(self, gateway_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_gateway got unknown kwargs: {extra_kwargs!r}") @@ -519,16 +518,16 @@ 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') 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", @@ -536,7 +535,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'), @@ -612,7 +611,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}") @@ -621,10 +620,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 = { @@ -632,7 +631,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'), @@ -751,7 +750,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}") @@ -787,14 +786,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'), @@ -882,7 +881,7 @@ def remove_gateway_lock(self, gateway_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_gateway_lock got unknown kwargs: {extra_kwargs!r}") @@ -891,10 +890,10 @@ def remove_gateway_lock(self, gateway_id, remove_resource_lock_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 = { @@ -903,7 +902,7 @@ def remove_gateway_lock(self, gateway_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'), @@ -996,7 +995,7 @@ def update_gateway(self, gateway_id, update_gateway_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_gateway got unknown kwargs: {extra_kwargs!r}") @@ -1005,16 +1004,16 @@ 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') 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", @@ -1022,7 +1021,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 0ce7243ca3..fdcc8f4ec5 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 @@ -172,7 +171,7 @@ def add_subscriber_lock(self, subscriber_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_subscriber_lock got unknown kwargs: {extra_kwargs!r}") @@ -181,10 +180,10 @@ def add_subscriber_lock(self, subscriber_id, add_resource_lock_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 = { @@ -193,7 +192,7 @@ def add_subscriber_lock(self, subscriber_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'), @@ -294,7 +293,7 @@ def change_subscriber_compartment(self, subscriber_id, change_subscriber_compart "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_subscriber_compartment got unknown kwargs: {extra_kwargs!r}") @@ -303,16 +302,16 @@ 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') 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", @@ -321,7 +320,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'), @@ -408,7 +407,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}") @@ -419,7 +418,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'), @@ -510,7 +509,7 @@ def delete_subscriber(self, subscriber_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_subscriber got unknown kwargs: {extra_kwargs!r}") @@ -519,16 +518,16 @@ 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') 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", @@ -536,7 +535,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'), @@ -612,7 +611,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}") @@ -621,10 +620,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 = { @@ -632,7 +631,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'), @@ -746,7 +745,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}") @@ -781,14 +780,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'), @@ -876,7 +875,7 @@ def remove_subscriber_lock(self, subscriber_id, remove_resource_lock_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"remove_subscriber_lock got unknown kwargs: {extra_kwargs!r}") @@ -885,10 +884,10 @@ def remove_subscriber_lock(self, subscriber_id, remove_resource_lock_details, ** "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 = { @@ -897,7 +896,7 @@ def remove_subscriber_lock(self, subscriber_id, remove_resource_lock_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'), @@ -990,7 +989,7 @@ def update_subscriber(self, subscriber_id, update_subscriber_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_subscriber got unknown kwargs: {extra_kwargs!r}") @@ -999,16 +998,16 @@ 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') 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", @@ -1016,7 +1015,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 9fb604bf9d..87072e2a6e 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 @@ -172,7 +171,7 @@ def add_usage_plan_lock(self, usage_plan_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_usage_plan_lock got unknown kwargs: {extra_kwargs!r}") @@ -181,10 +180,10 @@ def add_usage_plan_lock(self, usage_plan_id, add_resource_lock_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 = { @@ -193,7 +192,7 @@ def add_usage_plan_lock(self, usage_plan_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'), @@ -294,7 +293,7 @@ def change_usage_plan_compartment(self, usage_plan_id, change_usage_plan_compart "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_usage_plan_compartment got unknown kwargs: {extra_kwargs!r}") @@ -303,16 +302,16 @@ 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') 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", @@ -321,7 +320,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'), @@ -408,7 +407,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}") @@ -419,7 +418,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'), @@ -510,7 +509,7 @@ def delete_usage_plan(self, usage_plan_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_usage_plan got unknown kwargs: {extra_kwargs!r}") @@ -519,16 +518,16 @@ 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') 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", @@ -536,7 +535,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'), @@ -612,7 +611,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}") @@ -621,10 +620,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 = { @@ -632,7 +631,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'), @@ -746,7 +745,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}") @@ -781,14 +780,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'), @@ -876,7 +875,7 @@ def remove_usage_plan_lock(self, usage_plan_id, remove_resource_lock_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"remove_usage_plan_lock got unknown kwargs: {extra_kwargs!r}") @@ -885,10 +884,10 @@ def remove_usage_plan_lock(self, usage_plan_id, remove_resource_lock_details, ** "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 = { @@ -897,7 +896,7 @@ def remove_usage_plan_lock(self, usage_plan_id, remove_resource_lock_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'), @@ -990,7 +989,7 @@ def update_usage_plan(self, usage_plan_id, update_usage_plan_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_usage_plan got unknown kwargs: {extra_kwargs!r}") @@ -999,16 +998,16 @@ 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') 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", @@ -1016,7 +1015,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 14d40f1e28..aa57fb5670 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 @@ -178,7 +177,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}") @@ -187,10 +186,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 = { @@ -200,7 +199,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'), @@ -275,7 +274,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}") @@ -284,10 +283,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 = { @@ -295,7 +294,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'), @@ -396,7 +395,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}") @@ -405,10 +404,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: @@ -431,14 +430,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'), @@ -541,7 +540,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}") @@ -550,10 +549,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: @@ -576,14 +575,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'), @@ -690,7 +689,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}") @@ -717,14 +716,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 44eec010ac..b3d59782cb 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 copy_configuration(self, copy_configuration_details, apm_domain_id, apm_targ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_configuration got unknown kwargs: {extra_kwargs!r}") @@ -185,7 +184,7 @@ def copy_configuration(self, copy_configuration_details, apm_domain_id, apm_targ "apmDomainId": apm_domain_id, "apmTargetDomainId": apm_target_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 copy_configuration(self, copy_configuration_details, apm_domain_id, apm_targ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_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}") @@ -299,7 +298,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", @@ -308,7 +307,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'), @@ -403,7 +402,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}") @@ -412,16 +411,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", @@ -429,7 +428,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'), @@ -519,7 +518,7 @@ def export_configuration(self, export_configuration_details, apm_domain_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"export_configuration got unknown kwargs: {extra_kwargs!r}") @@ -527,7 +526,7 @@ def export_configuration(self, export_configuration_details, apm_domain_id, **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", @@ -535,7 +534,7 @@ def export_configuration(self, export_configuration_details, apm_domain_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'), @@ -622,7 +621,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}") @@ -631,23 +630,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'), @@ -728,7 +727,7 @@ def get_match_agents_with_attribute_key(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_match_agents_with_attribute_key got unknown kwargs: {extra_kwargs!r}") @@ -736,14 +735,14 @@ def get_match_agents_with_attribute_key(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'), @@ -833,7 +832,7 @@ def import_configuration(self, import_configuration_details, apm_domain_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"import_configuration got unknown kwargs: {extra_kwargs!r}") @@ -841,7 +840,7 @@ def import_configuration(self, import_configuration_details, apm_domain_id, **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", @@ -849,7 +848,7 @@ def import_configuration(self, import_configuration_details, apm_domain_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'), @@ -999,7 +998,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}") @@ -1032,14 +1031,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'), @@ -1121,7 +1120,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}") @@ -1129,14 +1128,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'), @@ -1217,7 +1216,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}") @@ -1225,14 +1224,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'), @@ -1315,7 +1314,7 @@ def test(self, apm_domain_id, test_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"test got unknown kwargs: {extra_kwargs!r}") @@ -1323,14 +1322,14 @@ def test(self, apm_domain_id, test_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'), @@ -1432,7 +1431,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}") @@ -1441,16 +1440,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", @@ -1459,7 +1458,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'), @@ -1545,7 +1544,7 @@ def update_match_agents_with_attribute_key(self, apm_domain_id, update_match_age "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_match_agents_with_attribute_key got unknown kwargs: {extra_kwargs!r}") @@ -1553,14 +1552,14 @@ def update_match_agents_with_attribute_key(self, apm_domain_id, update_match_age 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'), @@ -1645,7 +1644,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}") @@ -1653,14 +1652,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 53bd5cfd99..b69f982d1e 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 @@ -179,7 +178,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}") @@ -188,10 +187,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 = { @@ -201,7 +200,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'), @@ -288,7 +287,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}") @@ -299,7 +298,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'), @@ -385,7 +384,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}") @@ -394,10 +393,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 = { @@ -406,7 +405,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'), @@ -493,7 +492,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}") @@ -502,10 +501,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 = { @@ -514,7 +513,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'), @@ -592,7 +591,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}") @@ -601,10 +600,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 = { @@ -612,7 +611,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'), @@ -690,7 +689,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}") @@ -699,10 +698,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 = { @@ -710,7 +709,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'), @@ -796,7 +795,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}") @@ -805,24 +804,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'), @@ -932,7 +931,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}") @@ -967,14 +966,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'), @@ -1059,7 +1058,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}") @@ -1068,10 +1067,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: @@ -1084,14 +1083,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'), @@ -1179,7 +1178,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}") @@ -1188,24 +1187,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'), @@ -1293,7 +1292,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}") @@ -1302,24 +1301,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'), @@ -1407,7 +1406,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}") @@ -1417,14 +1416,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'), @@ -1513,7 +1512,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}") @@ -1522,10 +1521,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 = { @@ -1534,7 +1533,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'), @@ -1622,7 +1621,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}") @@ -1631,10 +1630,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 = { @@ -1643,7 +1642,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 3716837e8f..fb0b271de3 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 @@ -175,7 +174,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}") @@ -184,16 +183,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", @@ -201,7 +200,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'), @@ -296,7 +295,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}") @@ -304,7 +303,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", @@ -312,7 +311,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'), @@ -405,7 +404,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}") @@ -413,7 +412,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", @@ -421,7 +420,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'), @@ -514,7 +513,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}") @@ -522,7 +521,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", @@ -530,7 +529,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'), @@ -623,7 +622,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}") @@ -631,7 +630,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", @@ -639,7 +638,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'), @@ -735,7 +734,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}") @@ -744,16 +743,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", @@ -761,7 +760,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'), @@ -856,7 +855,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}") @@ -865,16 +864,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", @@ -882,7 +881,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'), @@ -972,7 +971,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}") @@ -981,16 +980,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", @@ -998,7 +997,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'), @@ -1088,7 +1087,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}") @@ -1097,16 +1096,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", @@ -1114,7 +1113,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'), @@ -1204,7 +1203,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}") @@ -1213,16 +1212,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", @@ -1230,7 +1229,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'), @@ -1323,7 +1322,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}") @@ -1333,16 +1332,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", @@ -1350,7 +1349,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'), @@ -1432,7 +1431,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}") @@ -1441,23 +1440,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'), @@ -1541,7 +1540,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}") @@ -1550,23 +1549,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'), @@ -1662,7 +1661,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}") @@ -1672,10 +1671,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 = { @@ -1684,14 +1683,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'), @@ -1775,7 +1774,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}") @@ -1784,23 +1783,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'), @@ -1884,7 +1883,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}") @@ -1893,23 +1892,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'), @@ -1996,7 +1995,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}") @@ -2006,23 +2005,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'), @@ -2146,7 +2145,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}") @@ -2182,14 +2181,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'), @@ -2328,7 +2327,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}") @@ -2368,14 +2367,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'), @@ -2491,7 +2490,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}") @@ -2519,14 +2518,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'), @@ -2640,7 +2639,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}") @@ -2668,14 +2667,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'), @@ -2791,7 +2790,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}") @@ -2819,14 +2818,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'), @@ -2955,7 +2954,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}") @@ -2964,10 +2963,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: @@ -3002,14 +3001,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'), @@ -3104,7 +3103,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}") @@ -3113,16 +3112,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", @@ -3130,7 +3129,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'), @@ -3227,7 +3226,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}") @@ -3236,16 +3235,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", @@ -3253,7 +3252,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'), @@ -3350,7 +3349,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}") @@ -3359,16 +3358,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", @@ -3376,7 +3375,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'), @@ -3473,7 +3472,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}") @@ -3482,16 +3481,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", @@ -3499,7 +3498,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'), @@ -3599,7 +3598,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}") @@ -3609,16 +3608,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", @@ -3626,7 +3625,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 a1f88378ab..4f410cd58e 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 @@ -170,7 +169,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}") @@ -178,14 +177,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'), @@ -274,7 +273,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}") @@ -282,14 +281,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'), @@ -372,7 +371,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}") @@ -380,14 +379,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'), @@ -469,7 +468,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}") @@ -477,14 +476,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'), @@ -566,7 +565,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}") @@ -574,14 +573,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'), @@ -665,7 +664,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}") @@ -673,14 +672,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'), @@ -764,7 +763,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}") @@ -779,14 +778,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'), @@ -871,7 +870,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}") @@ -887,14 +886,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 42d55af5cd..ce46f033f9 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 @@ -171,7 +170,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}") @@ -181,14 +180,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'), @@ -289,7 +288,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}") @@ -301,14 +300,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/scheduled_query_client.py b/src/oci/apm_traces/scheduled_query_client.py index 5ad46a7e9d..b222a64760 100644 --- a/src/oci/apm_traces/scheduled_query_client.py +++ b/src/oci/apm_traces/scheduled_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 @@ -177,7 +176,7 @@ def create_scheduled_query(self, apm_domain_id, create_scheduled_query_details, "opc_retry_token", "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_scheduled_query got unknown kwargs: {extra_kwargs!r}") @@ -185,7 +184,7 @@ def create_scheduled_query(self, apm_domain_id, create_scheduled_query_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", @@ -194,7 +193,7 @@ def create_scheduled_query(self, apm_domain_id, create_scheduled_query_details, "opc-retry-token": kwargs.get("opc_retry_token", 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'), @@ -293,7 +292,7 @@ def delete_scheduled_query(self, apm_domain_id, scheduled_query_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_scheduled_query got unknown kwargs: {extra_kwargs!r}") @@ -302,16 +301,16 @@ def delete_scheduled_query(self, apm_domain_id, scheduled_query_id, **kwargs): "scheduledQueryId": scheduled_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') 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", @@ -320,7 +319,7 @@ def delete_scheduled_query(self, apm_domain_id, scheduled_query_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'), @@ -409,7 +408,7 @@ def get_scheduled_query(self, apm_domain_id, scheduled_query_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_scheduled_query got unknown kwargs: {extra_kwargs!r}") @@ -418,16 +417,16 @@ def get_scheduled_query(self, apm_domain_id, scheduled_query_id, **kwargs): "scheduledQueryId": scheduled_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') 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", @@ -435,7 +434,7 @@ def get_scheduled_query(self, apm_domain_id, scheduled_query_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'), @@ -549,7 +548,7 @@ def list_scheduled_queries(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_scheduled_queries got unknown kwargs: {extra_kwargs!r}") @@ -576,7 +575,7 @@ def list_scheduled_queries(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", @@ -584,7 +583,7 @@ def list_scheduled_queries(self, apm_domain_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'), @@ -689,7 +688,7 @@ def update_scheduled_query(self, apm_domain_id, scheduled_query_id, update_sched "opc_retry_token", "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_scheduled_query got unknown kwargs: {extra_kwargs!r}") @@ -698,16 +697,16 @@ def update_scheduled_query(self, apm_domain_id, scheduled_query_id, update_sched "scheduledQueryId": scheduled_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') 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", @@ -717,7 +716,7 @@ def update_scheduled_query(self, apm_domain_id, scheduled_query_id, update_sched "opc-retry-token": kwargs.get("opc_retry_token", 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'), diff --git a/src/oci/apm_traces/trace_client.py b/src/oci/apm_traces/trace_client.py index 5466988245..fab252904d 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 @@ -180,7 +179,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}") @@ -189,10 +188,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 = { @@ -202,14 +201,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'), @@ -305,7 +304,7 @@ def get_log(self, apm_domain_id, log_key, time_log_started_greater_than_or_equal "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -314,10 +313,10 @@ def get_log(self, apm_domain_id, log_key, time_log_started_greater_than_or_equal "logKey": 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') query_params = { @@ -325,7 +324,7 @@ def get_log(self, apm_domain_id, log_key, time_log_started_greater_than_or_equal "timeLogStartedGreaterThanOrEqualTo": time_log_started_greater_than_or_equal_to, "timeLogEndedLessThan": time_log_ended_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", @@ -333,7 +332,7 @@ def get_log(self, apm_domain_id, log_key, time_log_started_greater_than_or_equal "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -433,7 +432,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}") @@ -443,10 +442,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: @@ -462,14 +461,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'), @@ -565,7 +564,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}") @@ -574,10 +573,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: @@ -593,14 +592,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'), @@ -694,7 +693,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}") @@ -703,10 +702,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 = { @@ -715,14 +714,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/appmgmt_control/appmgmt_control_client.py b/src/oci/appmgmt_control/appmgmt_control_client.py index aa54a06934..6f8e607c8d 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 @@ -170,7 +169,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}") @@ -179,10 +178,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 = { @@ -191,7 +190,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'), @@ -265,7 +264,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}") @@ -274,10 +273,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 = { @@ -285,7 +284,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'), @@ -363,7 +362,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}") @@ -372,10 +371,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 = { @@ -383,7 +382,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'), @@ -485,7 +484,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}") @@ -512,14 +511,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'), @@ -605,7 +604,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}") @@ -614,24 +613,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'), @@ -719,7 +718,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}") @@ -728,24 +727,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'), @@ -837,7 +836,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}") @@ -848,14 +847,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'), @@ -941,7 +940,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}") @@ -950,10 +949,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 = { @@ -962,7 +961,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 fe7fc7eb4b..73ef71c27d 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 @@ -192,7 +191,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}") @@ -201,10 +200,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 = { @@ -214,7 +213,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'), @@ -319,7 +318,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}") @@ -328,10 +327,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 = { @@ -341,7 +340,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'), @@ -435,7 +434,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}") @@ -447,7 +446,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'), @@ -535,7 +534,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}") @@ -546,7 +545,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'), @@ -634,7 +633,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}") @@ -645,7 +644,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'), @@ -733,7 +732,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}") @@ -742,10 +741,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 = { @@ -754,7 +753,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'), @@ -841,7 +840,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}") @@ -850,10 +849,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 = { @@ -862,7 +861,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'), @@ -949,7 +948,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}") @@ -958,10 +957,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 = { @@ -970,7 +969,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'), @@ -1059,7 +1058,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}") @@ -1068,10 +1067,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 = { @@ -1080,7 +1079,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'), @@ -1177,7 +1176,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}") @@ -1188,10 +1187,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 = { @@ -1200,7 +1199,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'), @@ -1287,7 +1286,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}") @@ -1296,10 +1295,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 = { @@ -1308,7 +1307,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'), @@ -1387,7 +1386,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}") @@ -1395,14 +1394,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'), @@ -1485,7 +1484,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}") @@ -1494,10 +1493,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 = { @@ -1505,7 +1504,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'), @@ -1588,7 +1587,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}") @@ -1597,10 +1596,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 = { @@ -1608,7 +1607,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'), @@ -1691,7 +1690,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}") @@ -1700,10 +1699,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 = { @@ -1711,7 +1710,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'), @@ -1796,7 +1795,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}") @@ -1805,10 +1804,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 = { @@ -1816,7 +1815,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'), @@ -1909,7 +1908,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}") @@ -1920,10 +1919,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 = { @@ -1931,7 +1930,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'), @@ -2014,7 +2013,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}") @@ -2023,10 +2022,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 = { @@ -2034,7 +2033,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'), @@ -2207,7 +2206,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}") @@ -2249,14 +2248,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'), @@ -2421,7 +2420,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}") @@ -2456,14 +2455,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'), @@ -2606,7 +2605,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}") @@ -2637,14 +2636,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'), @@ -2790,7 +2789,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}") @@ -2823,14 +2822,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'), @@ -2965,7 +2964,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}") @@ -2995,14 +2994,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'), @@ -3081,7 +3080,7 @@ def lookup_container_image_by_uri(self, lookup_container_image_by_uri_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"lookup_container_image_by_uri got unknown kwargs: {extra_kwargs!r}") @@ -3091,7 +3090,7 @@ def lookup_container_image_by_uri(self, lookup_container_image_by_uri_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'), @@ -3191,7 +3190,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}") @@ -3200,10 +3199,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 = { @@ -3213,7 +3212,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'), @@ -3316,7 +3315,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}") @@ -3325,10 +3324,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 = { @@ -3338,7 +3337,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'), @@ -3431,7 +3430,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}") @@ -3439,7 +3438,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", @@ -3447,7 +3446,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'), @@ -3541,7 +3540,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}") @@ -3550,10 +3549,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 = { @@ -3562,7 +3561,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'), @@ -3656,7 +3655,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}") @@ -3665,10 +3664,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 = { @@ -3677,7 +3676,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'), @@ -3771,7 +3770,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}") @@ -3780,10 +3779,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 = { @@ -3792,7 +3791,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'), @@ -3890,7 +3889,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}") @@ -3899,10 +3898,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 = { @@ -3911,7 +3910,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'), @@ -4015,7 +4014,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}") @@ -4026,10 +4025,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 = { @@ -4038,7 +4037,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'), @@ -4132,7 +4131,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}") @@ -4141,10 +4140,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 = { @@ -4153,7 +4152,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 5f19506216..73db2850eb 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 @@ -155,7 +154,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}") @@ -163,7 +162,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", @@ -278,7 +277,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}") @@ -289,14 +288,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'), @@ -367,7 +366,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}") @@ -375,7 +374,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 6bc2fae53c..644dcd0b09 100644 --- a/src/oci/auth/auth_utils.py +++ b/src/oci/auth/auth_utils.py @@ -4,7 +4,6 @@ import random import warnings -from oci._vendor import six def get_tenancy_id_from_certificate(cert): @@ -24,10 +23,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 cb30995db7..71d2e68a5f 100644 --- a/src/oci/auth/certificate_retriever.py +++ b/src/oci/auth/certificate_retriever.py @@ -8,9 +8,9 @@ from oci._vendor.requests.exceptions import HTTPError from oci.exceptions import ServiceError +import io import oci.retry import os.path -from oci._vendor import six import threading import logging import pprint @@ -123,7 +123,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() @@ -211,7 +211,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( @@ -228,13 +228,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)) @@ -253,7 +253,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: @@ -310,13 +310,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 cea37ee320..ffc9678b21 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 @@ -187,7 +186,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}") @@ -196,10 +195,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 = { @@ -209,7 +208,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'), @@ -295,7 +294,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}") @@ -306,7 +305,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'), @@ -405,7 +404,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}") @@ -414,10 +413,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 = { @@ -426,7 +425,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'), @@ -514,7 +513,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}") @@ -523,10 +522,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 = { @@ -535,7 +534,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'), @@ -621,7 +620,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}") @@ -631,10 +630,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 = { @@ -643,7 +642,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'), @@ -720,7 +719,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}") @@ -729,10 +728,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 = { @@ -740,7 +739,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'), @@ -822,7 +821,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}") @@ -832,10 +831,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 = { @@ -843,7 +842,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'), @@ -962,7 +961,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}") @@ -989,14 +988,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'), @@ -1113,7 +1112,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}") @@ -1122,10 +1121,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: @@ -1149,14 +1148,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'), @@ -1255,7 +1254,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}") @@ -1264,10 +1263,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 = { @@ -1277,7 +1276,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'), @@ -1379,7 +1378,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}") @@ -1389,10 +1388,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 = { @@ -1402,7 +1401,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 72f8a33bc3..a89775c909 100644 --- a/src/oci/base_client.py +++ b/src/oci/base_client.py @@ -20,11 +20,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, HTTPConnection +import urllib.parse from . import constants, exceptions, regions, retry from .auth import signers @@ -51,7 +52,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 oke_workload_refresh_enabled = os.environ.get('OCI_OKE_WORKLOAD_REFRESH_ENABLED', "True").lower() == "true" @@ -83,9 +84,9 @@ def utc_now(): def is_http_log_enabled(is_enabled): if is_enabled: - six.moves.http_client.HTTPConnection.debuglevel = 1 + HTTPConnection.debuglevel = 1 else: - six.moves.http_client.HTTPConnection.debuglevel = 0 + HTTPConnection.debuglevel = 0 def _sanitize_headers_for_requests(headers): @@ -93,8 +94,8 @@ def _sanitize_headers_for_requests(headers): # Convert int, float and bool to string # Bools are automatically handled with this as bool is a subclass of int # Convert a list of strings to csv string - 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) if isinstance(header_value, list) and all(isinstance(item, str) for item in header_value): headers[header_name] = ",".join(header_value) @@ -134,7 +135,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) @@ -263,7 +264,7 @@ class BaseClient(object): primitive_type_map = { 'int': int, 'float': float, - 'str': six.u, + 'str': str, 'bool': bool, 'date': date, 'datetime': datetime, @@ -546,9 +547,9 @@ def call_api(self, resource_path, method, path_params = self.sanitize_for_serialization(path_params) for k, v in path_params.items(): if should_enable_strict_url_encoding: - replacement = six.moves.urllib.parse.quote(str(self.to_path_value(v)), safe='') + replacement = urllib.parse.quote(str(self.to_path_value(v)), safe='') else: - 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) @@ -844,13 +845,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 @@ -903,10 +904,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: @@ -1008,7 +1009,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 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 @@ -1016,7 +1017,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 @@ -1063,7 +1064,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 @@ -1086,7 +1087,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 6ffaf21669..32fa496e5c 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 @@ -171,7 +170,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}") @@ -180,10 +179,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 = { @@ -192,7 +191,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'), @@ -276,7 +275,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}") @@ -287,7 +286,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'), @@ -372,7 +371,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}") @@ -383,7 +382,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'), @@ -468,7 +467,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}") @@ -477,10 +476,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 = { @@ -489,7 +488,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'), @@ -571,7 +570,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}") @@ -580,10 +579,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 = { @@ -592,7 +591,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'), @@ -666,7 +665,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}") @@ -675,10 +674,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 = { @@ -686,7 +685,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'), @@ -764,7 +763,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}") @@ -773,10 +772,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 = { @@ -784,7 +783,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'), @@ -862,7 +861,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}") @@ -871,10 +870,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 = { @@ -882,7 +881,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'), @@ -992,7 +991,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}") @@ -1028,14 +1027,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'), @@ -1145,7 +1144,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}") @@ -1181,14 +1180,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'), @@ -1272,7 +1271,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}") @@ -1281,24 +1280,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'), @@ -1384,7 +1383,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}") @@ -1393,24 +1392,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'), @@ -1496,7 +1495,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}") @@ -1506,14 +1505,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'), @@ -1600,7 +1599,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}") @@ -1609,10 +1608,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 = { @@ -1621,7 +1620,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'), @@ -1710,7 +1709,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}") @@ -1719,10 +1718,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 = { @@ -1731,7 +1730,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 273248cad6..22424e6e5d 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 @@ -182,7 +181,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}") @@ -192,10 +191,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 = { @@ -205,7 +204,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'), @@ -304,7 +303,7 @@ def activate_iam_user_sync_configuration(self, bds_instance_id, identity_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"activate_iam_user_sync_configuration got unknown kwargs: {extra_kwargs!r}") @@ -314,10 +313,10 @@ def activate_iam_user_sync_configuration(self, bds_instance_id, identity_configu "identityConfigurationId": identity_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 = { @@ -327,7 +326,7 @@ def activate_iam_user_sync_configuration(self, bds_instance_id, identity_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'), @@ -426,7 +425,7 @@ def activate_upst_configuration(self, bds_instance_id, identity_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"activate_upst_configuration got unknown kwargs: {extra_kwargs!r}") @@ -436,10 +435,10 @@ def activate_upst_configuration(self, bds_instance_id, identity_configuration_id "identityConfigurationId": identity_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 = { @@ -449,7 +448,7 @@ def activate_upst_configuration(self, bds_instance_id, identity_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'), @@ -545,7 +544,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}") @@ -554,10 +553,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 = { @@ -567,7 +566,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'), @@ -663,7 +662,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}") @@ -672,10 +671,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 = { @@ -685,7 +684,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'), @@ -781,7 +780,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}") @@ -790,10 +789,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 = { @@ -803,7 +802,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'), @@ -899,7 +898,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}") @@ -908,10 +907,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 = { @@ -921,7 +920,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'), @@ -1017,7 +1016,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}") @@ -1026,10 +1025,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 = { @@ -1039,7 +1038,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'), @@ -1135,7 +1134,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}") @@ -1144,10 +1143,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 = { @@ -1157,7 +1156,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'), @@ -1253,7 +1252,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}") @@ -1262,10 +1261,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 = { @@ -1275,7 +1274,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'), @@ -1371,7 +1370,7 @@ def backup_node(self, bds_instance_id, backup_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"backup_node got unknown kwargs: {extra_kwargs!r}") @@ -1380,10 +1379,10 @@ def backup_node(self, bds_instance_id, backup_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 = { @@ -1393,7 +1392,7 @@ def backup_node(self, bds_instance_id, backup_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'), @@ -1489,7 +1488,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}") @@ -1498,10 +1497,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 = { @@ -1511,7 +1510,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'), @@ -1609,7 +1608,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}") @@ -1618,10 +1617,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 = { @@ -1631,7 +1630,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'), @@ -1727,7 +1726,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}") @@ -1736,10 +1735,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 = { @@ -1749,7 +1748,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'), @@ -1837,7 +1836,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}") @@ -1846,10 +1845,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 = { @@ -1858,7 +1857,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'), @@ -1943,7 +1942,7 @@ def create_bds_capacity_report(self, create_bds_capacity_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"create_bds_capacity_report got unknown kwargs: {extra_kwargs!r}") @@ -1954,7 +1953,7 @@ def create_bds_capacity_report(self, create_bds_capacity_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'), @@ -2039,7 +2038,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}") @@ -2050,7 +2049,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'), @@ -2136,7 +2135,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}") @@ -2145,10 +2144,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 = { @@ -2157,7 +2156,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'), @@ -2245,7 +2244,7 @@ def create_identity_configuration(self, bds_instance_id, create_identity_configu "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_configuration got unknown kwargs: {extra_kwargs!r}") @@ -2254,10 +2253,10 @@ def create_identity_configuration(self, bds_instance_id, create_identity_configu "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 = { @@ -2266,7 +2265,7 @@ def create_identity_configuration(self, bds_instance_id, create_identity_configu "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_node_backup_configuration(self, bds_instance_id, create_node_backup_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"create_node_backup_configuration got unknown kwargs: {extra_kwargs!r}") @@ -2363,10 +2362,10 @@ def create_node_backup_configuration(self, bds_instance_id, create_node_backup_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 = { @@ -2375,7 +2374,7 @@ def create_node_backup_configuration(self, bds_instance_id, create_node_backup_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'), @@ -2463,7 +2462,7 @@ def create_node_replace_configuration(self, bds_instance_id, create_node_replace "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_replace_configuration got unknown kwargs: {extra_kwargs!r}") @@ -2472,10 +2471,10 @@ def create_node_replace_configuration(self, bds_instance_id, create_node_replace "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 = { @@ -2484,7 +2483,7 @@ def create_node_replace_configuration(self, bds_instance_id, create_node_replace "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2572,7 +2571,7 @@ def create_resource_principal_configuration(self, bds_instance_id, create_resour "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_resource_principal_configuration got unknown kwargs: {extra_kwargs!r}") @@ -2581,10 +2580,10 @@ def create_resource_principal_configuration(self, bds_instance_id, create_resour "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 = { @@ -2593,7 +2592,7 @@ def create_resource_principal_configuration(self, bds_instance_id, create_resour "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 deactivate_iam_user_sync_configuration(self, bds_instance_id, identity_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"deactivate_iam_user_sync_configuration got unknown kwargs: {extra_kwargs!r}") @@ -2702,10 +2701,10 @@ def deactivate_iam_user_sync_configuration(self, bds_instance_id, identity_confi "identityConfigurationId": identity_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 = { @@ -2715,7 +2714,7 @@ def deactivate_iam_user_sync_configuration(self, bds_instance_id, identity_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'), @@ -2814,7 +2813,7 @@ def deactivate_upst_configuration(self, bds_instance_id, identity_configuration_ "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_upst_configuration got unknown kwargs: {extra_kwargs!r}") @@ -2824,10 +2823,10 @@ def deactivate_upst_configuration(self, bds_instance_id, identity_configuration_ "identityConfigurationId": identity_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 = { @@ -2837,7 +2836,7 @@ def deactivate_upst_configuration(self, bds_instance_id, identity_configuration_ "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'), @@ -2925,7 +2924,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}") @@ -2935,10 +2934,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 = { @@ -2947,7 +2946,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'), @@ -3029,7 +3028,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}") @@ -3038,10 +3037,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 = { @@ -3050,7 +3049,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'), @@ -3135,7 +3134,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}") @@ -3145,10 +3144,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 = { @@ -3157,7 +3156,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'), @@ -3242,7 +3241,7 @@ def delete_identity_configuration(self, bds_instance_id, identity_configuration_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_configuration got unknown kwargs: {extra_kwargs!r}") @@ -3252,10 +3251,10 @@ def delete_identity_configuration(self, bds_instance_id, identity_configuration_ "identityConfigurationId": identity_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 = { @@ -3264,7 +3263,7 @@ def delete_identity_configuration(self, bds_instance_id, identity_configuration_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3349,7 +3348,7 @@ def delete_node_backup(self, bds_instance_id, node_backup_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_node_backup got unknown kwargs: {extra_kwargs!r}") @@ -3359,10 +3358,10 @@ def delete_node_backup(self, bds_instance_id, node_backup_id, **kwargs): "nodeBackupId": node_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 = { @@ -3371,7 +3370,7 @@ def delete_node_backup(self, bds_instance_id, node_backup_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'), @@ -3456,7 +3455,7 @@ def delete_node_backup_configuration(self, bds_instance_id, node_backup_configur "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_backup_configuration got unknown kwargs: {extra_kwargs!r}") @@ -3466,10 +3465,10 @@ def delete_node_backup_configuration(self, bds_instance_id, node_backup_configur "nodeBackupConfigurationId": node_backup_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 = { @@ -3478,7 +3477,7 @@ def delete_node_backup_configuration(self, bds_instance_id, node_backup_configur "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3571,7 +3570,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}") @@ -3580,10 +3579,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 = { @@ -3593,7 +3592,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'), @@ -3689,7 +3688,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}") @@ -3698,10 +3697,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 = { @@ -3711,7 +3710,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'), @@ -3807,7 +3806,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}") @@ -3816,10 +3815,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 = { @@ -3829,7 +3828,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'), @@ -3928,7 +3927,7 @@ def force_refresh_resource_principal(self, bds_instance_id, resource_principal_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"force_refresh_resource_principal got unknown kwargs: {extra_kwargs!r}") @@ -3938,10 +3937,10 @@ def force_refresh_resource_principal(self, bds_instance_id, resource_principal_c "resourcePrincipalConfigurationId": resource_principal_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 = { @@ -3951,7 +3950,7 @@ def force_refresh_resource_principal(self, bds_instance_id, resource_principal_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'), @@ -4031,7 +4030,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}") @@ -4041,10 +4040,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 = { @@ -4052,7 +4051,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'), @@ -4131,7 +4130,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}") @@ -4141,10 +4140,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 = { @@ -4152,7 +4151,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'), @@ -4228,7 +4227,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}") @@ -4237,10 +4236,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 = { @@ -4248,7 +4247,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'), @@ -4327,7 +4326,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}") @@ -4337,10 +4336,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 = { @@ -4348,7 +4347,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'), @@ -4447,7 +4446,7 @@ def get_identity_configuration(self, bds_instance_id, identity_configuration_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"get_identity_configuration got unknown kwargs: {extra_kwargs!r}") @@ -4457,10 +4456,10 @@ def get_identity_configuration(self, bds_instance_id, identity_configuration_id, "identityConfigurationId": identity_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: @@ -4483,14 +4482,14 @@ def get_identity_configuration(self, bds_instance_id, identity_configuration_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'), @@ -4571,7 +4570,7 @@ def get_node_backup(self, bds_instance_id, node_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_node_backup got unknown kwargs: {extra_kwargs!r}") @@ -4581,10 +4580,10 @@ def get_node_backup(self, bds_instance_id, node_backup_id, **kwargs): "nodeBackupId": node_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 = { @@ -4592,7 +4591,7 @@ def get_node_backup(self, bds_instance_id, node_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'), @@ -4671,7 +4670,7 @@ def get_node_backup_configuration(self, bds_instance_id, node_backup_configurati "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_backup_configuration got unknown kwargs: {extra_kwargs!r}") @@ -4681,10 +4680,10 @@ def get_node_backup_configuration(self, bds_instance_id, node_backup_configurati "nodeBackupConfigurationId": node_backup_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 = { @@ -4692,7 +4691,7 @@ def get_node_backup_configuration(self, bds_instance_id, node_backup_configurati "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4771,7 +4770,7 @@ def get_node_replace_configuration(self, bds_instance_id, node_replace_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_node_replace_configuration got unknown kwargs: {extra_kwargs!r}") @@ -4781,10 +4780,10 @@ def get_node_replace_configuration(self, bds_instance_id, node_replace_configura "nodeReplaceConfigurationId": node_replace_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 = { @@ -4792,7 +4791,7 @@ def get_node_replace_configuration(self, bds_instance_id, node_replace_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'), @@ -4887,7 +4886,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}") @@ -4896,16 +4895,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", @@ -4914,7 +4913,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'), @@ -4996,7 +4995,7 @@ def get_resource_principal_configuration(self, bds_instance_id, resource_princip "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_principal_configuration got unknown kwargs: {extra_kwargs!r}") @@ -5006,10 +5005,10 @@ def get_resource_principal_configuration(self, bds_instance_id, resource_princip "resourcePrincipalConfigurationId": resource_principal_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 = { @@ -5017,7 +5016,7 @@ def get_resource_principal_configuration(self, bds_instance_id, resource_princip "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5112,7 +5111,7 @@ def get_software_update(self, bds_instance_id, software_update_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"get_software_update got unknown kwargs: {extra_kwargs!r}") @@ -5122,10 +5121,10 @@ def get_software_update(self, bds_instance_id, software_update_key, **kwargs): "softwareUpdateKey": software_update_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 = { @@ -5135,7 +5134,7 @@ def get_software_update(self, bds_instance_id, software_update_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'), @@ -5212,7 +5211,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}") @@ -5221,10 +5220,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 = { @@ -5232,7 +5231,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'), @@ -5327,7 +5326,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}") @@ -5336,10 +5335,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 = { @@ -5349,7 +5348,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'), @@ -5445,7 +5444,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}") @@ -5454,10 +5453,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 = { @@ -5467,7 +5466,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'), @@ -5563,7 +5562,7 @@ def install_software_updates(self, bds_instance_id, install_software_updates_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"install_software_updates got unknown kwargs: {extra_kwargs!r}") @@ -5572,10 +5571,10 @@ def install_software_updates(self, bds_instance_id, install_software_updates_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 = { @@ -5585,7 +5584,7 @@ def install_software_updates(self, bds_instance_id, install_software_updates_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'), @@ -5695,7 +5694,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}") @@ -5704,10 +5703,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: @@ -5740,14 +5739,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'), @@ -5859,7 +5858,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}") @@ -5868,10 +5867,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: @@ -5904,14 +5903,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'), @@ -6006,7 +6005,7 @@ def list_bds_cluster_versions(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_bds_cluster_versions got unknown kwargs: {extra_kwargs!r}") @@ -6031,14 +6030,14 @@ def list_bds_cluster_versions(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'), @@ -6144,7 +6143,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}") @@ -6179,14 +6178,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'), @@ -6306,7 +6305,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}") @@ -6315,10 +6314,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: @@ -6360,14 +6359,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'), @@ -6478,7 +6477,7 @@ def list_identity_configurations(self, bds_instance_id, 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_identity_configurations got unknown kwargs: {extra_kwargs!r}") @@ -6487,10 +6486,10 @@ def list_identity_configurations(self, bds_instance_id, compartment_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: @@ -6523,14 +6522,14 @@ def list_identity_configurations(self, bds_instance_id, 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'), @@ -6638,7 +6637,7 @@ def list_node_backup_configurations(self, bds_instance_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_node_backup_configurations got unknown kwargs: {extra_kwargs!r}") @@ -6647,10 +6646,10 @@ def list_node_backup_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 'sort_by' in kwargs: @@ -6682,14 +6681,14 @@ def list_node_backup_configurations(self, bds_instance_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'), @@ -6801,7 +6800,7 @@ def list_node_backups(self, bds_instance_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_node_backups got unknown kwargs: {extra_kwargs!r}") @@ -6810,10 +6809,10 @@ def list_node_backups(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: @@ -6846,14 +6845,14 @@ def list_node_backups(self, bds_instance_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'), @@ -6961,7 +6960,7 @@ def list_node_replace_configurations(self, bds_instance_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_node_replace_configurations got unknown kwargs: {extra_kwargs!r}") @@ -6970,10 +6969,10 @@ def list_node_replace_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 'sort_by' in kwargs: @@ -7005,14 +7004,14 @@ def list_node_replace_configurations(self, bds_instance_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'), @@ -7126,7 +7125,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}") @@ -7135,10 +7134,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: @@ -7161,7 +7160,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", @@ -7170,7 +7169,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'), @@ -7285,7 +7284,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}") @@ -7294,10 +7293,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: @@ -7337,14 +7336,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'), @@ -7430,7 +7429,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}") @@ -7439,24 +7438,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'), @@ -7564,7 +7563,7 @@ def list_resource_principal_configurations(self, bds_instance_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_resource_principal_configurations got unknown kwargs: {extra_kwargs!r}") @@ -7573,10 +7572,10 @@ def list_resource_principal_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 'sort_by' in kwargs: @@ -7608,14 +7607,14 @@ def list_resource_principal_configurations(self, bds_instance_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'), @@ -7729,7 +7728,7 @@ def list_software_updates(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_software_updates got unknown kwargs: {extra_kwargs!r}") @@ -7738,10 +7737,10 @@ def list_software_updates(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: @@ -7764,7 +7763,7 @@ def list_software_updates(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", @@ -7773,7 +7772,7 @@ def list_software_updates(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'), @@ -7872,7 +7871,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}") @@ -7881,10 +7880,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: @@ -7907,14 +7906,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'), @@ -8012,7 +8011,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}") @@ -8021,10 +8020,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: @@ -8047,14 +8046,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'), @@ -8156,7 +8155,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}") @@ -8183,14 +8182,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'), @@ -8288,7 +8287,7 @@ def refresh_confidential_application(self, bds_instance_id, identity_configurati "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_confidential_application got unknown kwargs: {extra_kwargs!r}") @@ -8298,10 +8297,10 @@ def refresh_confidential_application(self, bds_instance_id, identity_configurati "identityConfigurationId": identity_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 = { @@ -8311,7 +8310,7 @@ def refresh_confidential_application(self, bds_instance_id, identity_configurati "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8410,7 +8409,7 @@ def refresh_upst_token_exchange_keytab(self, bds_instance_id, identity_configura "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_upst_token_exchange_keytab got unknown kwargs: {extra_kwargs!r}") @@ -8420,10 +8419,10 @@ def refresh_upst_token_exchange_keytab(self, bds_instance_id, identity_configura "identityConfigurationId": identity_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 = { @@ -8433,7 +8432,7 @@ def refresh_upst_token_exchange_keytab(self, bds_instance_id, identity_configura "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8532,7 +8531,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}") @@ -8542,10 +8541,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 = { @@ -8555,7 +8554,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'), @@ -8651,7 +8650,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}") @@ -8660,10 +8659,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 = { @@ -8673,7 +8672,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'), @@ -8769,7 +8768,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}") @@ -8778,10 +8777,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 = { @@ -8791,7 +8790,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'), @@ -8879,7 +8878,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}") @@ -8888,10 +8887,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 = { @@ -8900,7 +8899,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'), @@ -8998,7 +8997,7 @@ def remove_node_replace_configuration(self, bds_instance_id, node_replace_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_node_replace_configuration got unknown kwargs: {extra_kwargs!r}") @@ -9008,10 +9007,10 @@ def remove_node_replace_configuration(self, bds_instance_id, node_replace_config "nodeReplaceConfigurationId": node_replace_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 = { @@ -9021,7 +9020,7 @@ def remove_node_replace_configuration(self, bds_instance_id, node_replace_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'), @@ -9112,7 +9111,7 @@ def remove_resource_principal_configuration(self, bds_instance_id, resource_prin "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_principal_configuration got unknown kwargs: {extra_kwargs!r}") @@ -9122,10 +9121,10 @@ def remove_resource_principal_configuration(self, bds_instance_id, resource_prin "resourcePrincipalConfigurationId": resource_principal_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 = { @@ -9134,7 +9133,7 @@ def remove_resource_principal_configuration(self, bds_instance_id, resource_prin "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9229,7 +9228,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}") @@ -9238,10 +9237,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 = { @@ -9251,7 +9250,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'), @@ -9347,7 +9346,7 @@ def replace_node(self, bds_instance_id, replace_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"replace_node got unknown kwargs: {extra_kwargs!r}") @@ -9356,10 +9355,10 @@ def replace_node(self, bds_instance_id, replace_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 = { @@ -9369,7 +9368,7 @@ def replace_node(self, bds_instance_id, replace_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'), @@ -9465,7 +9464,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}") @@ -9474,10 +9473,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 = { @@ -9487,7 +9486,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'), @@ -9575,7 +9574,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}") @@ -9584,10 +9583,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 = { @@ -9596,7 +9595,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'), @@ -9683,7 +9682,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}") @@ -9692,10 +9691,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 = { @@ -9704,7 +9703,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'), @@ -9794,7 +9793,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}") @@ -9804,10 +9803,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 = { @@ -9816,7 +9815,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'), @@ -9898,7 +9897,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}") @@ -9908,10 +9907,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 = { @@ -9919,7 +9918,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'), @@ -10017,7 +10016,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}") @@ -10027,10 +10026,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 = { @@ -10040,7 +10039,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'), @@ -10128,7 +10127,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}") @@ -10137,10 +10136,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 = { @@ -10149,7 +10148,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'), @@ -10239,7 +10238,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}") @@ -10249,10 +10248,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 = { @@ -10261,7 +10260,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'), @@ -10359,7 +10358,7 @@ def update_identity_configuration(self, bds_instance_id, identity_configuration_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_configuration got unknown kwargs: {extra_kwargs!r}") @@ -10369,10 +10368,10 @@ def update_identity_configuration(self, bds_instance_id, identity_configuration_ "identityConfigurationId": identity_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 = { @@ -10382,7 +10381,7 @@ def update_identity_configuration(self, bds_instance_id, identity_configuration_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10481,7 +10480,7 @@ def update_node_backup_configuration(self, bds_instance_id, node_backup_configur "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_node_backup_configuration got unknown kwargs: {extra_kwargs!r}") @@ -10491,10 +10490,10 @@ def update_node_backup_configuration(self, bds_instance_id, node_backup_configur "nodeBackupConfigurationId": node_backup_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 = { @@ -10504,7 +10503,7 @@ def update_node_backup_configuration(self, bds_instance_id, node_backup_configur "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'), @@ -10603,7 +10602,7 @@ def update_node_replace_configuration(self, bds_instance_id, node_replace_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_node_replace_configuration got unknown kwargs: {extra_kwargs!r}") @@ -10613,10 +10612,10 @@ def update_node_replace_configuration(self, bds_instance_id, node_replace_config "nodeReplaceConfigurationId": node_replace_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 = { @@ -10626,7 +10625,7 @@ def update_node_replace_configuration(self, bds_instance_id, node_replace_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'), @@ -10725,7 +10724,7 @@ def update_resource_principal_configuration(self, bds_instance_id, resource_prin "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_resource_principal_configuration got unknown kwargs: {extra_kwargs!r}") @@ -10735,10 +10734,10 @@ def update_resource_principal_configuration(self, bds_instance_id, resource_prin "resourcePrincipalConfigurationId": resource_principal_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 = { @@ -10748,7 +10747,7 @@ def update_resource_principal_configuration(self, bds_instance_id, resource_prin "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/blockchain/blockchain_platform_client.py b/src/oci/blockchain/blockchain_platform_client.py index 958acf9c44..5fd5ada3f7 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 @@ -179,7 +178,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}") @@ -188,10 +187,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 = { @@ -201,7 +200,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'), @@ -286,7 +285,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}") @@ -297,7 +296,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'), @@ -391,7 +390,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}") @@ -400,10 +399,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 = { @@ -413,7 +412,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'), @@ -501,7 +500,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}") @@ -510,10 +509,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 = { @@ -522,7 +521,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'), @@ -615,7 +614,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}") @@ -624,10 +623,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 = { @@ -637,7 +636,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'), @@ -723,7 +722,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}") @@ -733,10 +732,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 = { @@ -745,7 +744,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'), @@ -838,7 +837,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}") @@ -848,10 +847,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 = { @@ -861,7 +860,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'), @@ -944,7 +943,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}") @@ -953,10 +952,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 = { @@ -965,7 +964,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'), @@ -1039,7 +1038,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}") @@ -1048,10 +1047,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 = { @@ -1059,7 +1058,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'), @@ -1138,7 +1137,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}") @@ -1148,10 +1147,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 = { @@ -1159,7 +1158,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'), @@ -1238,7 +1237,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}") @@ -1248,10 +1247,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 = { @@ -1259,7 +1258,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'), @@ -1335,7 +1334,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}") @@ -1344,10 +1343,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 = { @@ -1355,7 +1354,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'), @@ -1439,7 +1438,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}") @@ -1448,24 +1447,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'), @@ -1575,7 +1574,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}") @@ -1610,14 +1609,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'), @@ -1726,7 +1725,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}") @@ -1735,10 +1734,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: @@ -1762,7 +1761,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", @@ -1770,7 +1769,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'), @@ -1882,7 +1881,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}") @@ -1891,10 +1890,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: @@ -1918,7 +1917,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", @@ -1926,7 +1925,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'), @@ -2013,7 +2012,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}") @@ -2022,24 +2021,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'), @@ -2125,7 +2124,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}") @@ -2134,24 +2133,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'), @@ -2252,7 +2251,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}") @@ -2279,14 +2278,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'), @@ -2365,7 +2364,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}") @@ -2374,10 +2373,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 = { @@ -2385,7 +2384,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'), @@ -2482,7 +2481,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}") @@ -2491,10 +2490,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 = { @@ -2504,7 +2503,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'), @@ -2597,7 +2596,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}") @@ -2606,10 +2605,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 = { @@ -2619,7 +2618,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'), @@ -2710,7 +2709,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}") @@ -2719,10 +2718,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 = { @@ -2732,7 +2731,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'), @@ -2826,7 +2825,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}") @@ -2835,10 +2834,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 = { @@ -2848,7 +2847,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'), @@ -2947,7 +2946,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}") @@ -2957,10 +2956,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 = { @@ -2970,7 +2969,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'), @@ -3069,7 +3068,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}") @@ -3079,10 +3078,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 = { @@ -3092,7 +3091,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'), @@ -3188,7 +3187,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}") @@ -3197,10 +3196,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 = { @@ -3210,7 +3209,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 3cef0660ec..549a675807 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 @@ -171,7 +170,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}") @@ -180,10 +179,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 = { @@ -192,7 +191,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'), @@ -281,7 +280,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}") @@ -292,7 +291,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'), @@ -382,7 +381,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}") @@ -392,10 +391,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 = { @@ -404,7 +403,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'), @@ -488,7 +487,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}") @@ -497,10 +496,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 = { @@ -509,7 +508,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'), @@ -588,7 +587,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}") @@ -598,10 +597,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 = { @@ -609,7 +608,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'), @@ -687,7 +686,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}") @@ -696,10 +695,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 = { @@ -707,7 +706,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'), @@ -819,7 +818,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}") @@ -828,10 +827,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: @@ -863,14 +862,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'), @@ -999,7 +998,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}") @@ -1042,14 +1041,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'), @@ -1141,7 +1140,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}") @@ -1151,10 +1150,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 = { @@ -1163,7 +1162,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'), @@ -1254,7 +1253,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}") @@ -1263,10 +1262,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 = { @@ -1275,7 +1274,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 aa26b7a930..b35cb3aef5 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 @@ -170,7 +169,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}") @@ -181,7 +180,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'), @@ -269,7 +268,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}") @@ -280,7 +279,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'), @@ -371,7 +370,7 @@ def create_occ_customer(self, create_occ_customer_details, occ_customer_group_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_occ_customer got unknown kwargs: {extra_kwargs!r}") @@ -380,10 +379,10 @@ def create_occ_customer(self, create_occ_customer_details, occ_customer_group_id "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 = { @@ -392,7 +391,7 @@ def create_occ_customer(self, create_occ_customer_details, occ_customer_group_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'), @@ -482,7 +481,7 @@ def create_occ_customer_group(self, create_occ_customer_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_occ_customer_group got unknown kwargs: {extra_kwargs!r}") @@ -493,7 +492,7 @@ def create_occ_customer_group(self, create_occ_customer_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'), @@ -581,7 +580,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}") @@ -590,10 +589,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 = { @@ -602,7 +601,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'), @@ -687,7 +686,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}") @@ -696,10 +695,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 = { @@ -708,7 +707,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'), @@ -796,7 +795,7 @@ def delete_occ_customer(self, occ_customer_group_id, occ_customer_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_customer got unknown kwargs: {extra_kwargs!r}") @@ -806,10 +805,10 @@ def delete_occ_customer(self, occ_customer_group_id, occ_customer_id, **kwargs): "occCustomerId": occ_customer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 delete_occ_customer(self, occ_customer_group_id, occ_customer_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_occ_customer_group(self, occ_customer_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_occ_customer_group got unknown kwargs: {extra_kwargs!r}") @@ -912,10 +911,10 @@ def delete_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 = { @@ -924,7 +923,7 @@ def delete_occ_customer_group(self, occ_customer_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'), @@ -1001,7 +1000,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}") @@ -1010,10 +1009,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 = { @@ -1021,7 +1020,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'), @@ -1116,7 +1115,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}") @@ -1125,10 +1124,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 = { @@ -1138,7 +1137,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'), @@ -1218,7 +1217,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}") @@ -1227,10 +1226,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 = { @@ -1238,7 +1237,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'), @@ -1317,7 +1316,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}") @@ -1326,10 +1325,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 = { @@ -1337,7 +1336,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'), @@ -1456,7 +1455,7 @@ def list_internal_namespace_occ_overviews(self, namespace, compartment_id, occ_c "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_internal_namespace_occ_overviews got unknown kwargs: {extra_kwargs!r}") @@ -1465,10 +1464,10 @@ def list_internal_namespace_occ_overviews(self, namespace, compartment_id, occ_c "namespace": namespace } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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: @@ -1496,14 +1495,14 @@ def list_internal_namespace_occ_overviews(self, namespace, compartment_id, occ_c "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_internal_occ_handover_resource_block_details(self, occ_handover_resourc "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_internal_occ_handover_resource_block_details got unknown kwargs: {extra_kwargs!r}") @@ -1636,14 +1635,14 @@ def list_internal_occ_handover_resource_block_details(self, occ_handover_resourc "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 list_internal_occ_handover_resource_blocks(self, namespace, 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_internal_occ_handover_resource_blocks got unknown kwargs: {extra_kwargs!r}") @@ -1805,14 +1804,14 @@ def list_internal_occ_handover_resource_blocks(self, namespace, 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'), @@ -1927,7 +1926,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}") @@ -1936,10 +1935,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 'sort_order' in kwargs: @@ -1966,14 +1965,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'), @@ -2094,7 +2093,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}") @@ -2138,14 +2137,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'), @@ -2267,7 +2266,7 @@ def list_occ_availability_catalogs_internal(self, compartment_id, occ_customer_g "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}") @@ -2312,14 +2311,14 @@ def list_occ_availability_catalogs_internal(self, compartment_id, occ_customer_g "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2442,7 +2441,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}") @@ -2487,14 +2486,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'), @@ -2620,7 +2619,7 @@ def list_occ_capacity_requests_internal(self, compartment_id, occ_customer_group "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}") @@ -2666,14 +2665,14 @@ def list_occ_capacity_requests_internal(self, compartment_id, occ_customer_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'), @@ -2786,7 +2785,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}") @@ -2822,14 +2821,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'), @@ -2933,7 +2932,7 @@ def list_occ_handover_resource_block_details(self, occ_handover_resource_block_i "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_handover_resource_block_details got unknown kwargs: {extra_kwargs!r}") @@ -2960,14 +2959,14 @@ def list_occ_handover_resource_block_details(self, occ_handover_resource_block_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'), @@ -3090,7 +3089,7 @@ def list_occ_handover_resource_blocks(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_occ_handover_resource_blocks got unknown kwargs: {extra_kwargs!r}") @@ -3128,14 +3127,14 @@ def list_occ_handover_resource_blocks(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'), @@ -3251,7 +3250,7 @@ def list_occ_overviews(self, namespace, 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_overviews got unknown kwargs: {extra_kwargs!r}") @@ -3260,10 +3259,10 @@ def list_occ_overviews(self, namespace, compartment_id, **kwargs): "namespace": namespace } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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: @@ -3290,14 +3289,14 @@ def list_occ_overviews(self, namespace, 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'), @@ -3389,7 +3388,7 @@ def patch_internal_occ_capacity_request(self, patch_occ_capacity_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"patch_internal_occ_capacity_request got unknown kwargs: {extra_kwargs!r}") @@ -3398,10 +3397,10 @@ def patch_internal_occ_capacity_request(self, patch_occ_capacity_request_details "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 = { @@ -3410,7 +3409,7 @@ def patch_internal_occ_capacity_request(self, patch_occ_capacity_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'), @@ -3502,7 +3501,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}") @@ -3511,10 +3510,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 = { @@ -3523,7 +3522,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'), @@ -3620,7 +3619,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}") @@ -3629,10 +3628,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 = { @@ -3642,7 +3641,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'), @@ -3731,7 +3730,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}") @@ -3740,10 +3739,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 = { @@ -3752,7 +3751,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'), @@ -3844,7 +3843,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}") @@ -3853,10 +3852,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 = { @@ -3865,7 +3864,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'), @@ -3957,7 +3956,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}") @@ -3966,10 +3965,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 = { @@ -3978,7 +3977,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'), @@ -4073,7 +4072,7 @@ def update_occ_customer(self, update_occ_customer_details, occ_customer_group_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_occ_customer got unknown kwargs: {extra_kwargs!r}") @@ -4083,10 +4082,10 @@ def update_occ_customer(self, update_occ_customer_details, occ_customer_group_id "occCustomerId": occ_customer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4095,7 +4094,7 @@ def update_occ_customer(self, update_occ_customer_details, occ_customer_group_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'), @@ -4187,7 +4186,7 @@ def update_occ_customer_group(self, update_occ_customer_group_details, occ_custo "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_customer_group got unknown kwargs: {extra_kwargs!r}") @@ -4196,10 +4195,10 @@ def update_occ_customer_group(self, update_occ_customer_group_details, occ_custo "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 = { @@ -4208,7 +4207,7 @@ def update_occ_customer_group(self, update_occ_customer_group_details, occ_custo "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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/demand_signal_client.py b/src/oci/capacity_management/demand_signal_client.py index 264a7be6b8..d14242cc44 100644 --- a/src/oci/capacity_management/demand_signal_client.py +++ b/src/oci/capacity_management/demand_signal_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 bulk_create_occm_demand_signal_item(self, bulk_create_occm_demand_signal_ite "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_occm_demand_signal_item got unknown kwargs: {extra_kwargs!r}") @@ -181,7 +180,7 @@ def bulk_create_occm_demand_signal_item(self, bulk_create_occm_demand_signal_ite "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_occm_demand_signal(self, create_occm_demand_signal_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_occm_demand_signal got unknown kwargs: {extra_kwargs!r}") @@ -278,7 +277,7 @@ def create_occm_demand_signal(self, create_occm_demand_signal_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'), @@ -366,7 +365,7 @@ def create_occm_demand_signal_item(self, create_occm_demand_signal_item_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_occm_demand_signal_item got unknown kwargs: {extra_kwargs!r}") @@ -377,7 +376,7 @@ def create_occm_demand_signal_item(self, create_occm_demand_signal_item_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'), @@ -465,7 +464,7 @@ def delete_occm_demand_signal(self, occm_demand_signal_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_occm_demand_signal got unknown kwargs: {extra_kwargs!r}") @@ -474,10 +473,10 @@ def delete_occm_demand_signal(self, occm_demand_signal_id, **kwargs): "occmDemandSignalId": occm_demand_signal_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -486,7 +485,7 @@ def delete_occm_demand_signal(self, occm_demand_signal_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 delete_occm_demand_signal_item(self, occm_demand_signal_item_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_occm_demand_signal_item got unknown kwargs: {extra_kwargs!r}") @@ -580,10 +579,10 @@ def delete_occm_demand_signal_item(self, occm_demand_signal_item_id, **kwargs): "occmDemandSignalItemId": occm_demand_signal_item_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 delete_occm_demand_signal_item(self, occm_demand_signal_item_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 get_occm_demand_signal(self, occm_demand_signal_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_occm_demand_signal got unknown kwargs: {extra_kwargs!r}") @@ -678,10 +677,10 @@ def get_occm_demand_signal(self, occm_demand_signal_id, **kwargs): "occmDemandSignalId": occm_demand_signal_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 get_occm_demand_signal(self, occm_demand_signal_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_occm_demand_signal_item(self, occm_demand_signal_item_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_occm_demand_signal_item got unknown kwargs: {extra_kwargs!r}") @@ -777,10 +776,10 @@ def get_occm_demand_signal_item(self, occm_demand_signal_item_id, **kwargs): "occmDemandSignalItemId": occm_demand_signal_item_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_occm_demand_signal_item(self, occm_demand_signal_item_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 list_occm_demand_signal_catalog_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_occm_demand_signal_catalog_resources got unknown kwargs: {extra_kwargs!r}") @@ -932,14 +931,14 @@ def list_occm_demand_signal_catalog_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'), @@ -1046,7 +1045,7 @@ def list_occm_demand_signal_deliveries(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_occm_demand_signal_deliveries got unknown kwargs: {extra_kwargs!r}") @@ -1074,14 +1073,14 @@ def list_occm_demand_signal_deliveries(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'), @@ -1194,7 +1193,7 @@ def list_occm_demand_signal_items(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_occm_demand_signal_items got unknown kwargs: {extra_kwargs!r}") @@ -1230,14 +1229,14 @@ def list_occm_demand_signal_items(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'), @@ -1348,7 +1347,7 @@ def list_occm_demand_signals(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_occm_demand_signals got unknown kwargs: {extra_kwargs!r}") @@ -1377,14 +1376,14 @@ def list_occm_demand_signals(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'), @@ -1474,7 +1473,7 @@ def update_occm_demand_signal(self, update_occm_demand_signal_details, occm_dema "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_occm_demand_signal got unknown kwargs: {extra_kwargs!r}") @@ -1483,10 +1482,10 @@ def update_occm_demand_signal(self, update_occm_demand_signal_details, occm_dema "occmDemandSignalId": occm_demand_signal_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 update_occm_demand_signal(self, update_occm_demand_signal_details, occm_dema "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_occm_demand_signal_item(self, update_occm_demand_signal_item_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_occm_demand_signal_item got unknown kwargs: {extra_kwargs!r}") @@ -1596,10 +1595,10 @@ def update_occm_demand_signal_item(self, update_occm_demand_signal_item_details, "occmDemandSignalItemId": occm_demand_signal_item_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_occm_demand_signal_item(self, update_occm_demand_signal_item_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/capacity_management/internal_demand_signal_client.py b/src/oci/capacity_management/internal_demand_signal_client.py index 06a23c913a..6d561359f0 100644 --- a/src/oci/capacity_management/internal_demand_signal_client.py +++ b/src/oci/capacity_management/internal_demand_signal_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 create_internal_occm_demand_signal_delivery(self, create_internal_occm_deman "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_internal_occm_demand_signal_delivery got unknown kwargs: {extra_kwargs!r}") @@ -183,7 +182,7 @@ def create_internal_occm_demand_signal_delivery(self, create_internal_occm_deman "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_internal_occm_demand_signal_delivery(self, occm_demand_signal_deliver "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_internal_occm_demand_signal_delivery got unknown kwargs: {extra_kwargs!r}") @@ -280,10 +279,10 @@ def delete_internal_occm_demand_signal_delivery(self, occm_demand_signal_deliver "occmDemandSignalDeliveryId": occm_demand_signal_delivery_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_internal_occm_demand_signal_delivery(self, occm_demand_signal_deliver "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -369,7 +368,7 @@ def get_internal_occm_demand_signal(self, occm_demand_signal_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_internal_occm_demand_signal got unknown kwargs: {extra_kwargs!r}") @@ -378,10 +377,10 @@ def get_internal_occm_demand_signal(self, occm_demand_signal_id, **kwargs): "occmDemandSignalId": occm_demand_signal_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -389,7 +388,7 @@ def get_internal_occm_demand_signal(self, occm_demand_signal_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_internal_occm_demand_signal_catalog(self, occm_demand_signal_catalog_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_internal_occm_demand_signal_catalog got unknown kwargs: {extra_kwargs!r}") @@ -477,10 +476,10 @@ def get_internal_occm_demand_signal_catalog(self, occm_demand_signal_catalog_id, "occmDemandSignalCatalogId": occm_demand_signal_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 = { @@ -488,7 +487,7 @@ def get_internal_occm_demand_signal_catalog(self, occm_demand_signal_catalog_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'), @@ -567,7 +566,7 @@ def get_internal_occm_demand_signal_delivery(self, occm_demand_signal_delivery_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_internal_occm_demand_signal_delivery got unknown kwargs: {extra_kwargs!r}") @@ -576,10 +575,10 @@ def get_internal_occm_demand_signal_delivery(self, occm_demand_signal_delivery_i "occmDemandSignalDeliveryId": occm_demand_signal_delivery_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_internal_occm_demand_signal_delivery(self, occm_demand_signal_delivery_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'), @@ -702,7 +701,7 @@ def list_internal_occm_demand_signal_catalog_resources(self, compartment_id, occ "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_internal_occm_demand_signal_catalog_resources got unknown kwargs: {extra_kwargs!r}") @@ -739,14 +738,14 @@ def list_internal_occm_demand_signal_catalog_resources(self, compartment_id, occ "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 list_internal_occm_demand_signal_catalogs(self, compartment_id, occ_customer "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_internal_occm_demand_signal_catalogs got unknown kwargs: {extra_kwargs!r}") @@ -880,14 +879,14 @@ def list_internal_occm_demand_signal_catalogs(self, compartment_id, occ_customer "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_internal_occm_demand_signal_deliveries(self, compartment_id, occ_custom "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_internal_occm_demand_signal_deliveries got unknown kwargs: {extra_kwargs!r}") @@ -1026,14 +1025,14 @@ def list_internal_occm_demand_signal_deliveries(self, compartment_id, occ_custom "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 list_internal_occm_demand_signal_items(self, compartment_id, occ_customer_gr "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_internal_occm_demand_signal_items got unknown kwargs: {extra_kwargs!r}") @@ -1186,14 +1185,14 @@ def list_internal_occm_demand_signal_items(self, compartment_id, occ_customer_gr "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 list_internal_occm_demand_signals(self, compartment_id, occ_customer_group_i "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_internal_occm_demand_signals got unknown kwargs: {extra_kwargs!r}") @@ -1337,14 +1336,14 @@ def list_internal_occm_demand_signals(self, compartment_id, occ_customer_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'), @@ -1434,7 +1433,7 @@ def update_internal_occm_demand_signal(self, update_internal_occm_demand_signal_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_occm_demand_signal got unknown kwargs: {extra_kwargs!r}") @@ -1443,10 +1442,10 @@ def update_internal_occm_demand_signal(self, update_internal_occm_demand_signal_ "occmDemandSignalId": occm_demand_signal_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1455,7 +1454,7 @@ def update_internal_occm_demand_signal(self, update_internal_occm_demand_signal_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1547,7 +1546,7 @@ def update_internal_occm_demand_signal_delivery(self, update_internal_occm_deman "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_occm_demand_signal_delivery got unknown kwargs: {extra_kwargs!r}") @@ -1556,10 +1555,10 @@ def update_internal_occm_demand_signal_delivery(self, update_internal_occm_deman "occmDemandSignalDeliveryId": occm_demand_signal_delivery_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1568,7 +1567,7 @@ def update_internal_occm_demand_signal_delivery(self, update_internal_occm_deman "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 58267abc23..f515e05a0e 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 @@ -161,7 +160,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}") @@ -170,10 +169,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 = { @@ -181,7 +180,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'), @@ -273,7 +272,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}") @@ -282,10 +281,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: @@ -300,14 +299,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'), @@ -410,7 +409,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}") @@ -419,10 +418,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: @@ -445,14 +444,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'), @@ -544,7 +543,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}") @@ -553,10 +552,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: @@ -577,14 +576,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'), @@ -676,7 +675,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}") @@ -685,10 +684,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: @@ -709,14 +708,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 e54e4c2354..e719aa86b0 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 @@ -170,7 +169,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}") @@ -179,10 +178,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 = { @@ -191,7 +190,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'), @@ -280,7 +279,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}") @@ -290,10 +289,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 = { @@ -302,7 +301,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'), @@ -388,7 +387,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}") @@ -397,10 +396,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 = { @@ -409,7 +408,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'), @@ -496,7 +495,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}") @@ -506,10 +505,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 = { @@ -518,7 +517,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'), @@ -619,7 +618,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}") @@ -628,10 +627,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 = { @@ -641,7 +640,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'), @@ -745,7 +744,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}") @@ -754,10 +753,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 = { @@ -767,7 +766,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'), @@ -871,7 +870,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}") @@ -880,10 +879,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 = { @@ -893,7 +892,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'), @@ -981,7 +980,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}") @@ -992,7 +991,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'), @@ -1080,7 +1079,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}") @@ -1091,7 +1090,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'), @@ -1179,7 +1178,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}") @@ -1190,7 +1189,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'), @@ -1277,7 +1276,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}") @@ -1286,10 +1285,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 = { @@ -1298,7 +1297,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'), @@ -1374,7 +1373,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}") @@ -1383,10 +1382,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 = { @@ -1394,7 +1393,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'), @@ -1472,7 +1471,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}") @@ -1481,10 +1480,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 = { @@ -1492,7 +1491,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'), @@ -1570,7 +1569,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}") @@ -1579,10 +1578,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 = { @@ -1590,7 +1589,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'), @@ -1668,7 +1667,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}") @@ -1677,10 +1676,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 = { @@ -1688,7 +1687,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'), @@ -1769,7 +1768,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}") @@ -1779,10 +1778,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 = { @@ -1790,7 +1789,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'), @@ -1871,7 +1870,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}") @@ -1881,10 +1880,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 = { @@ -1892,7 +1891,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'), @@ -2016,7 +2015,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}") @@ -2054,14 +2053,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'), @@ -2177,7 +2176,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}") @@ -2213,14 +2212,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'), @@ -2341,7 +2340,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}") @@ -2378,14 +2377,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'), @@ -2489,7 +2488,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}") @@ -2498,10 +2497,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: @@ -2525,14 +2524,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'), @@ -2638,7 +2637,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}") @@ -2647,10 +2646,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: @@ -2674,14 +2673,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'), @@ -2804,7 +2803,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}") @@ -2841,14 +2840,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'), @@ -2949,7 +2948,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}") @@ -2959,10 +2958,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 = { @@ -2972,7 +2971,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'), @@ -3074,7 +3073,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}") @@ -3084,10 +3083,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 = { @@ -3097,7 +3096,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'), @@ -3187,7 +3186,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}") @@ -3196,10 +3195,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 = { @@ -3208,7 +3207,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'), @@ -3302,7 +3301,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}") @@ -3312,10 +3311,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 = { @@ -3324,7 +3323,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'), @@ -3418,7 +3417,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}") @@ -3427,10 +3426,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 = { @@ -3439,7 +3438,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'), @@ -3534,7 +3533,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}") @@ -3544,10 +3543,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 = { @@ -3556,7 +3555,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'), @@ -3645,7 +3644,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}") @@ -3654,10 +3653,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 = { @@ -3666,7 +3665,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'), @@ -3757,7 +3756,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}") @@ -3766,10 +3765,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 = { @@ -3778,7 +3777,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'), @@ -3869,7 +3868,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}") @@ -3878,10 +3877,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 = { @@ -3890,7 +3889,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 4311ab47a5..fded62b360 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 @@ -194,7 +193,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}") @@ -210,7 +209,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'), @@ -327,7 +326,7 @@ def get_incident(self, incident_key, 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"get_incident got unknown kwargs: {extra_kwargs!r}") @@ -336,16 +335,16 @@ def get_incident(self, incident_key, compartment_id, **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": 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", @@ -360,7 +359,7 @@ def get_incident(self, incident_key, 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'), @@ -498,7 +497,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}") @@ -526,7 +525,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", @@ -537,7 +536,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'), @@ -681,7 +680,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}") @@ -716,7 +715,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", @@ -730,7 +729,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'), @@ -866,7 +865,7 @@ def put_attachment(self, put_attachment_details, incident_key, attachment_name, "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"put_attachment got unknown kwargs: {extra_kwargs!r}") @@ -875,10 +874,10 @@ def put_attachment(self, put_attachment_details, incident_key, attachment_name, "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 = { @@ -886,7 +885,7 @@ def put_attachment(self, put_attachment_details, incident_key, attachment_name, "compartmentId": compartment_id, "isRestrictedFlag": is_restricted_flag } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -901,7 +900,7 @@ def put_attachment(self, put_attachment_details, incident_key, attachment_name, "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} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -910,7 +909,7 @@ def put_attachment(self, put_attachment_details, incident_key, attachment_name, put_attachment_details = kwargs.get("put_attachment_details", missing) if put_attachment_details is not missing and put_attachment_details is not None: - if (not isinstance(put_attachment_details, (six.binary_type, six.string_types)) and + if (not isinstance(put_attachment_details, (bytes, str)) and not hasattr(put_attachment_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -1046,7 +1045,7 @@ def update_incident(self, incident_key, update_incident_details, compartment_id, "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}") @@ -1055,16 +1054,16 @@ def update_incident(self, incident_key, update_incident_details, compartment_id, "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": 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", @@ -1079,7 +1078,7 @@ def update_incident(self, incident_key, update_incident_details, compartment_id, "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'), @@ -1196,7 +1195,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}") @@ -1211,7 +1210,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", @@ -1225,7 +1224,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/cloud_bridge/common_client.py b/src/oci/cloud_bridge/common_client.py index 108e83ae64..e71b72a0a3 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 @@ -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'), @@ -265,7 +264,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}") @@ -274,10 +273,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 = { @@ -285,7 +284,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'), @@ -383,7 +382,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}") @@ -392,10 +391,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: @@ -418,14 +417,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'), @@ -525,7 +524,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}") @@ -534,10 +533,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: @@ -560,14 +559,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'), @@ -681,7 +680,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}") @@ -717,14 +716,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 32bb849915..ba8c5db2f1 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 @@ -181,7 +180,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}") @@ -190,10 +189,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 = { @@ -203,7 +202,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'), @@ -303,7 +302,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}") @@ -312,10 +311,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 = { @@ -325,7 +324,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'), @@ -412,7 +411,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}") @@ -423,7 +422,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'), @@ -510,7 +509,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}") @@ -521,7 +520,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'), @@ -610,7 +609,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}") @@ -619,10 +618,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 = { @@ -631,7 +630,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'), @@ -717,7 +716,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}") @@ -726,10 +725,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 = { @@ -738,7 +737,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'), @@ -816,7 +815,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}") @@ -825,10 +824,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 = { @@ -836,7 +835,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'), @@ -916,7 +915,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}") @@ -925,10 +924,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 = { @@ -936,7 +935,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'), @@ -1024,7 +1023,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}") @@ -1033,24 +1032,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'), @@ -1166,7 +1165,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}") @@ -1202,14 +1201,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'), @@ -1323,7 +1322,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}") @@ -1359,14 +1358,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'), @@ -1471,7 +1470,7 @@ def list_supported_cloud_regions(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_supported_cloud_regions got unknown kwargs: {extra_kwargs!r}") @@ -1505,14 +1504,14 @@ def list_supported_cloud_regions(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'), @@ -1600,7 +1599,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}") @@ -1609,10 +1608,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 = { @@ -1621,7 +1620,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'), @@ -1711,7 +1710,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}") @@ -1720,10 +1719,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 = { @@ -1732,7 +1731,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'), @@ -1823,7 +1822,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}") @@ -1832,10 +1831,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 = { @@ -1844,7 +1843,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 fcf46b172d..7847988390 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 @@ -206,7 +205,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}") @@ -245,14 +244,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'), @@ -349,7 +348,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}") @@ -358,10 +357,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 = { @@ -371,7 +370,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'), @@ -469,7 +468,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}") @@ -478,10 +477,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 = { @@ -491,7 +490,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'), @@ -580,7 +579,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}") @@ -591,7 +590,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'), @@ -678,7 +677,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}") @@ -689,7 +688,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'), @@ -774,7 +773,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}") @@ -783,10 +782,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 = { @@ -795,7 +794,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'), @@ -879,7 +878,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}") @@ -888,10 +887,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 = { @@ -900,7 +899,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'), @@ -976,7 +975,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}") @@ -985,10 +984,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 = { @@ -996,7 +995,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'), @@ -1074,7 +1073,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}") @@ -1083,10 +1082,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 = { @@ -1094,7 +1093,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'), @@ -1183,7 +1182,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}") @@ -1192,10 +1191,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 = { @@ -1204,7 +1203,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'), @@ -1335,7 +1334,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}") @@ -1382,14 +1381,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'), @@ -1487,7 +1486,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}") @@ -1496,10 +1495,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: @@ -1522,14 +1521,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'), @@ -1635,7 +1634,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}") @@ -1669,14 +1668,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'), @@ -1765,7 +1764,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}") @@ -1774,10 +1773,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 = { @@ -1786,7 +1785,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'), @@ -1877,7 +1876,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}") @@ -1886,10 +1885,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 = { @@ -1898,7 +1897,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'), @@ -1989,7 +1988,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}") @@ -1998,10 +1997,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 = { @@ -2010,7 +2009,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 188b792d66..f55739b1d5 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 @@ -179,7 +178,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}") @@ -188,10 +187,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 = { @@ -201,7 +200,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'), @@ -301,7 +300,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}") @@ -310,10 +309,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 = { @@ -323,7 +322,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'), @@ -421,7 +420,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}") @@ -430,10 +429,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 = { @@ -443,7 +442,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'), @@ -541,7 +540,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}") @@ -550,10 +549,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 = { @@ -563,7 +562,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'), @@ -650,7 +649,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}") @@ -661,7 +660,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'), @@ -748,7 +747,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}") @@ -759,7 +758,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'), @@ -846,7 +845,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}") @@ -857,7 +856,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'), @@ -952,7 +951,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}") @@ -961,10 +960,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 = { @@ -974,7 +973,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'), @@ -1059,7 +1058,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}") @@ -1068,10 +1067,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 = { @@ -1080,7 +1079,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'), @@ -1164,7 +1163,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}") @@ -1173,10 +1172,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 = { @@ -1185,7 +1184,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'), @@ -1261,7 +1260,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}") @@ -1270,10 +1269,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 = { @@ -1281,7 +1280,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'), @@ -1359,7 +1358,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}") @@ -1368,10 +1367,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 = { @@ -1379,7 +1378,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'), @@ -1457,7 +1456,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}") @@ -1466,10 +1465,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 = { @@ -1477,7 +1476,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'), @@ -1558,7 +1557,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}") @@ -1568,10 +1567,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 = { @@ -1579,7 +1578,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'), @@ -1695,7 +1694,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}") @@ -1732,14 +1731,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'), @@ -1855,7 +1854,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}") @@ -1892,14 +1891,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'), @@ -2001,7 +2000,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}") @@ -2028,14 +2027,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'), @@ -2147,7 +2146,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}") @@ -2183,14 +2182,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'), @@ -2287,7 +2286,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}") @@ -2296,10 +2295,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 = { @@ -2309,7 +2308,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'), @@ -2409,7 +2408,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}") @@ -2418,10 +2417,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 = { @@ -2431,7 +2430,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'), @@ -2531,7 +2530,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}") @@ -2540,10 +2539,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 = { @@ -2553,7 +2552,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'), @@ -2651,7 +2650,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}") @@ -2660,10 +2659,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 = { @@ -2673,7 +2672,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'), @@ -2768,7 +2767,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}") @@ -2778,10 +2777,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 = { @@ -2790,7 +2789,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 83d2c655da..9aa68497b2 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 @@ -185,7 +184,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}") @@ -194,10 +193,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 = { @@ -207,7 +206,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'), @@ -294,7 +293,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}") @@ -303,10 +302,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 = { @@ -315,7 +314,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'), @@ -410,7 +409,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}") @@ -419,10 +418,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 = { @@ -432,7 +431,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'), @@ -531,7 +530,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}") @@ -540,10 +539,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 = { @@ -553,7 +552,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'), @@ -649,7 +648,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}") @@ -658,10 +657,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 = { @@ -671,7 +670,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'), @@ -769,7 +768,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}") @@ -778,10 +777,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 = { @@ -791,7 +790,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'), @@ -887,7 +886,7 @@ def change_saved_query_compartment(self, saved_query_id, change_saved_query_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_saved_query_compartment got unknown kwargs: {extra_kwargs!r}") @@ -896,10 +895,10 @@ def change_saved_query_compartment(self, saved_query_id, change_saved_query_comp "savedQueryId": saved_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 = { @@ -909,7 +908,7 @@ def change_saved_query_compartment(self, saved_query_id, change_saved_query_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'), @@ -1007,7 +1006,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}") @@ -1016,10 +1015,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 = { @@ -1029,7 +1028,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'), @@ -1127,7 +1126,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}") @@ -1136,10 +1135,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 = { @@ -1149,7 +1148,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'), @@ -1234,7 +1233,7 @@ def create_adhoc_query(self, create_adhoc_query_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_adhoc_query got unknown kwargs: {extra_kwargs!r}") @@ -1245,7 +1244,7 @@ def create_adhoc_query(self, create_adhoc_query_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'), @@ -1330,7 +1329,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}") @@ -1341,7 +1340,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'), @@ -1427,7 +1426,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}") @@ -1438,7 +1437,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'), @@ -1521,7 +1520,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}") @@ -1532,7 +1531,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'), @@ -1620,7 +1619,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}") @@ -1629,10 +1628,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 = { @@ -1641,7 +1640,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'), @@ -1728,7 +1727,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}") @@ -1739,7 +1738,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'), @@ -1825,7 +1824,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}") @@ -1836,7 +1835,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'), @@ -1921,7 +1920,7 @@ def create_saved_query(self, create_saved_query_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_saved_query got unknown kwargs: {extra_kwargs!r}") @@ -1932,7 +1931,7 @@ def create_saved_query(self, create_saved_query_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'), @@ -2018,7 +2017,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}") @@ -2029,7 +2028,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'), @@ -2115,7 +2114,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}") @@ -2126,7 +2125,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'), @@ -2211,7 +2210,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}") @@ -2222,7 +2221,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'), @@ -2312,7 +2311,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}") @@ -2321,10 +2320,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 = { @@ -2333,7 +2332,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'), @@ -2423,7 +2422,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}") @@ -2432,10 +2431,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 = { @@ -2444,7 +2443,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'), @@ -2532,7 +2531,7 @@ def create_wlp_agent(self, create_wlp_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_wlp_agent got unknown kwargs: {extra_kwargs!r}") @@ -2543,7 +2542,7 @@ def create_wlp_agent(self, create_wlp_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'), @@ -2636,7 +2635,7 @@ def delete_adhoc_query(self, adhoc_query_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_adhoc_query got unknown kwargs: {extra_kwargs!r}") @@ -2645,10 +2644,10 @@ def delete_adhoc_query(self, adhoc_query_id, **kwargs): "adhocQueryId": adhoc_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 = { @@ -2658,7 +2657,7 @@ def delete_adhoc_query(self, adhoc_query_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'), @@ -2741,7 +2740,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}") @@ -2750,10 +2749,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 = { @@ -2762,7 +2761,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'), @@ -2852,7 +2851,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}") @@ -2861,10 +2860,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 = { @@ -2874,7 +2873,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'), @@ -2965,7 +2964,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}") @@ -2974,10 +2973,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 = { @@ -2987,7 +2986,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'), @@ -3073,7 +3072,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}") @@ -3083,10 +3082,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 = { @@ -3095,7 +3094,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'), @@ -3183,7 +3182,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}") @@ -3194,10 +3193,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 = { @@ -3206,7 +3205,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'), @@ -3296,7 +3295,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}") @@ -3305,10 +3304,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 = { @@ -3318,7 +3317,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'), @@ -3401,7 +3400,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}") @@ -3410,10 +3409,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 = { @@ -3422,7 +3421,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'), @@ -3512,7 +3511,7 @@ def delete_saved_query(self, saved_query_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_saved_query got unknown kwargs: {extra_kwargs!r}") @@ -3521,10 +3520,10 @@ def delete_saved_query(self, saved_query_id, **kwargs): "savedQueryId": saved_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 = { @@ -3534,7 +3533,7 @@ def delete_saved_query(self, saved_query_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'), @@ -3617,7 +3616,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}") @@ -3626,10 +3625,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 = { @@ -3638,7 +3637,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'), @@ -3720,7 +3719,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}") @@ -3729,10 +3728,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 = { @@ -3741,7 +3740,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'), @@ -3823,7 +3822,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}") @@ -3832,10 +3831,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 = { @@ -3844,7 +3843,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'), @@ -3930,7 +3929,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}") @@ -3940,10 +3939,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 = { @@ -3952,7 +3951,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'), @@ -4039,7 +4038,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}") @@ -4049,10 +4048,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 = { @@ -4061,7 +4060,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'), @@ -4183,7 +4182,7 @@ def delete_wlp_agent(self, wlp_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_wlp_agent got unknown kwargs: {extra_kwargs!r}") @@ -4192,10 +4191,10 @@ def delete_wlp_agent(self, wlp_agent_id, **kwargs): "wlpAgentId": wlp_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 = { @@ -4205,7 +4204,7 @@ def delete_wlp_agent(self, wlp_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'), @@ -4304,7 +4303,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}") @@ -4313,16 +4312,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", @@ -4331,7 +4330,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'), @@ -4410,7 +4409,7 @@ def get_adhoc_query(self, adhoc_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_adhoc_query got unknown kwargs: {extra_kwargs!r}") @@ -4419,10 +4418,10 @@ def get_adhoc_query(self, adhoc_query_id, **kwargs): "adhocQueryId": adhoc_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 = { @@ -4430,7 +4429,7 @@ def get_adhoc_query(self, adhoc_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'), @@ -4506,7 +4505,7 @@ def get_adhoc_query_result_content(self, adhoc_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_adhoc_query_result_content got unknown kwargs: {extra_kwargs!r}") @@ -4515,10 +4514,10 @@ def get_adhoc_query_result_content(self, adhoc_query_id, **kwargs): "adhocQueryId": adhoc_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 = { @@ -4526,7 +4525,7 @@ def get_adhoc_query_result_content(self, adhoc_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'), @@ -4612,7 +4611,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}") @@ -4621,24 +4620,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'), @@ -4717,7 +4716,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}") @@ -4725,14 +4724,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'), @@ -4808,7 +4807,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}") @@ -4817,10 +4816,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 = { @@ -4828,7 +4827,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'), @@ -4904,7 +4903,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}") @@ -4913,10 +4912,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 = { @@ -4924,7 +4923,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'), @@ -5000,7 +4999,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}") @@ -5009,10 +5008,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 = { @@ -5020,7 +5019,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'), @@ -5096,7 +5095,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}") @@ -5105,10 +5104,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 = { @@ -5116,7 +5115,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'), @@ -5195,7 +5194,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}") @@ -5205,10 +5204,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 = { @@ -5216,7 +5215,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'), @@ -5295,7 +5294,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}") @@ -5305,10 +5304,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 = { @@ -5316,7 +5315,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'), @@ -5392,7 +5391,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}") @@ -5401,10 +5400,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 = { @@ -5412,7 +5411,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'), @@ -5488,7 +5487,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}") @@ -5497,10 +5496,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 = { @@ -5508,7 +5507,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'), @@ -5584,7 +5583,7 @@ def get_resource(self, 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_resource got unknown kwargs: {extra_kwargs!r}") @@ -5593,10 +5592,10 @@ def get_resource(self, resource_id, **kwargs): "resourceId": 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 = { @@ -5604,7 +5603,7 @@ def get_resource(self, 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'), @@ -5680,7 +5679,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}") @@ -5689,10 +5688,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 = { @@ -5700,7 +5699,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'), @@ -5779,7 +5778,7 @@ def get_resource_vulnerability(self, resource_id, vulnerability_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_resource_vulnerability got unknown kwargs: {extra_kwargs!r}") @@ -5789,10 +5788,10 @@ def get_resource_vulnerability(self, resource_id, vulnerability_key, **kwargs): "vulnerabilityKey": vulnerability_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 = { @@ -5800,7 +5799,7 @@ def get_resource_vulnerability(self, resource_id, vulnerability_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'), @@ -5876,7 +5875,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}") @@ -5885,10 +5884,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 = { @@ -5896,7 +5895,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'), @@ -5972,7 +5971,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}") @@ -5981,10 +5980,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 = { @@ -5992,7 +5991,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'), @@ -6071,7 +6070,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}") @@ -6081,10 +6080,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 = { @@ -6092,7 +6091,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'), @@ -6168,7 +6167,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}") @@ -6177,10 +6176,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 = { @@ -6188,7 +6187,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'), @@ -6264,7 +6263,7 @@ def get_saved_query(self, saved_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_saved_query got unknown kwargs: {extra_kwargs!r}") @@ -6273,10 +6272,10 @@ def get_saved_query(self, saved_query_id, **kwargs): "savedQueryId": saved_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 = { @@ -6284,7 +6283,7 @@ def get_saved_query(self, saved_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'), @@ -6362,7 +6361,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}") @@ -6371,10 +6370,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 = { @@ -6382,7 +6381,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'), @@ -6458,7 +6457,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}") @@ -6467,10 +6466,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 = { @@ -6478,7 +6477,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'), @@ -6554,7 +6553,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}") @@ -6563,10 +6562,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 = { @@ -6574,7 +6573,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'), @@ -6650,7 +6649,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}") @@ -6659,10 +6658,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 = { @@ -6670,7 +6669,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'), @@ -6746,7 +6745,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}") @@ -6755,10 +6754,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 = { @@ -6766,7 +6765,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'), @@ -6845,7 +6844,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}") @@ -6855,10 +6854,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 = { @@ -6866,7 +6865,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'), @@ -6948,7 +6947,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}") @@ -6959,10 +6958,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 = { @@ -6970,7 +6969,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'), @@ -7050,7 +7049,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}") @@ -7060,10 +7059,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 = { @@ -7071,7 +7070,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'), @@ -7156,7 +7155,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}") @@ -7167,10 +7166,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 = { @@ -7178,7 +7177,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'), @@ -7254,7 +7253,7 @@ def get_wlp_agent(self, wlp_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_wlp_agent got unknown kwargs: {extra_kwargs!r}") @@ -7263,10 +7262,10 @@ def get_wlp_agent(self, wlp_agent_id, **kwargs): "wlpAgentId": wlp_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 = { @@ -7274,7 +7273,7 @@ def get_wlp_agent(self, wlp_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'), @@ -7350,7 +7349,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}") @@ -7359,10 +7358,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 = { @@ -7370,7 +7369,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'), @@ -7513,7 +7512,7 @@ def list_adhoc_queries(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_adhoc_queries got unknown kwargs: {extra_kwargs!r}") @@ -7558,14 +7557,14 @@ def list_adhoc_queries(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'), @@ -7664,7 +7663,7 @@ def list_adhoc_query_results(self, adhoc_query_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_adhoc_query_results got unknown kwargs: {extra_kwargs!r}") @@ -7673,10 +7672,10 @@ def list_adhoc_query_results(self, adhoc_query_id, compartment_id, **kwargs): "adhocQueryId": adhoc_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') if 'sort_order' in kwargs: @@ -7700,14 +7699,14 @@ def list_adhoc_query_results(self, adhoc_query_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'), @@ -7811,7 +7810,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}") @@ -7845,14 +7844,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'), @@ -7986,7 +7985,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}") @@ -8040,14 +8039,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'), @@ -8149,7 +8148,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}") @@ -8158,10 +8157,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: @@ -8185,14 +8184,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'), @@ -8345,7 +8344,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}") @@ -8405,14 +8404,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'), @@ -8521,7 +8520,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}") @@ -8530,10 +8529,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: @@ -8566,14 +8565,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'), @@ -8718,7 +8717,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}") @@ -8763,14 +8762,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'), @@ -8879,7 +8878,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}") @@ -8888,10 +8887,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: @@ -8924,14 +8923,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'), @@ -9035,7 +9034,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}") @@ -9069,14 +9068,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'), @@ -9172,7 +9171,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}") @@ -9181,10 +9180,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: @@ -9207,14 +9206,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'), @@ -9318,7 +9317,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}") @@ -9352,14 +9351,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'), @@ -9507,7 +9506,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}") @@ -9560,14 +9559,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'), @@ -9663,7 +9662,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}") @@ -9689,14 +9688,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'), @@ -9792,7 +9791,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}") @@ -9801,10 +9800,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: @@ -9827,14 +9826,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'), @@ -9932,7 +9931,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}") @@ -9941,10 +9940,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: @@ -9967,14 +9966,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'), @@ -10075,7 +10074,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}") @@ -10084,10 +10083,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: @@ -10111,14 +10110,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'), @@ -10327,7 +10326,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}") @@ -10408,14 +10407,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'), @@ -10545,7 +10544,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}") @@ -10597,14 +10596,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'), @@ -10704,7 +10703,7 @@ def list_resource_ports(self, resource_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_ports got unknown kwargs: {extra_kwargs!r}") @@ -10713,10 +10712,10 @@ def list_resource_ports(self, resource_id, **kwargs): "resourceId": 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_order' in kwargs: @@ -10740,14 +10739,14 @@ def list_resource_ports(self, resource_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10846,7 +10845,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}") @@ -10855,10 +10854,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: @@ -10881,14 +10880,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'), @@ -10988,7 +10987,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}") @@ -10997,10 +10996,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: @@ -11023,14 +11022,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'), @@ -11194,7 +11193,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}") @@ -11238,14 +11237,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'), @@ -11354,7 +11353,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}") @@ -11396,14 +11395,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'), @@ -11507,7 +11506,7 @@ def list_resource_vulnerabilities(self, resource_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_vulnerabilities got unknown kwargs: {extra_kwargs!r}") @@ -11516,10 +11515,10 @@ def list_resource_vulnerabilities(self, resource_id, **kwargs): "resourceId": 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_order' in kwargs: @@ -11544,14 +11543,14 @@ def list_resource_vulnerabilities(self, resource_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11726,7 +11725,7 @@ def list_resources(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_resources got unknown kwargs: {extra_kwargs!r}") @@ -11779,14 +11778,14 @@ def list_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'), @@ -11883,7 +11882,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}") @@ -11892,10 +11891,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: @@ -11918,14 +11917,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'), @@ -12087,7 +12086,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}") @@ -12153,14 +12152,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'), @@ -12271,7 +12270,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}") @@ -12280,10 +12279,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: @@ -12316,14 +12315,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'), @@ -12468,7 +12467,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}") @@ -12513,14 +12512,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'), @@ -12628,7 +12627,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}") @@ -12663,14 +12662,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'), @@ -12787,7 +12786,7 @@ def list_saved_queries(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_saved_queries got unknown kwargs: {extra_kwargs!r}") @@ -12823,14 +12822,14 @@ def list_saved_queries(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'), @@ -12941,7 +12940,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}") @@ -12977,14 +12976,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'), @@ -13095,7 +13094,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}") @@ -13131,14 +13130,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'), @@ -13257,7 +13256,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}") @@ -13295,14 +13294,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'), @@ -13400,7 +13399,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}") @@ -13409,10 +13408,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: @@ -13435,14 +13434,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'), @@ -13541,7 +13540,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}") @@ -13550,10 +13549,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: @@ -13576,14 +13575,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'), @@ -13726,7 +13725,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}") @@ -13765,14 +13764,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'), @@ -13874,7 +13873,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}") @@ -13908,14 +13907,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'), @@ -14027,7 +14026,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}") @@ -14037,10 +14036,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: @@ -14073,14 +14072,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'), @@ -14193,7 +14192,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}") @@ -14202,10 +14201,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: @@ -14238,14 +14237,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'), @@ -14362,7 +14361,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}") @@ -14372,10 +14371,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: @@ -14408,14 +14407,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'), @@ -14528,7 +14527,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}") @@ -14537,10 +14536,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: @@ -14573,14 +14572,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'), @@ -14725,7 +14724,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}") @@ -14770,14 +14769,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'), @@ -14883,7 +14882,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}") @@ -14918,14 +14917,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'), @@ -15021,7 +15020,7 @@ def list_wlp_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_wlp_agents got unknown kwargs: {extra_kwargs!r}") @@ -15047,14 +15046,14 @@ def list_wlp_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'), @@ -15151,7 +15150,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}") @@ -15160,10 +15159,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: @@ -15186,14 +15185,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'), @@ -15292,7 +15291,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}") @@ -15301,10 +15300,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: @@ -15327,14 +15326,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'), @@ -15443,7 +15442,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}") @@ -15478,14 +15477,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'), @@ -15583,7 +15582,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}") @@ -15592,10 +15591,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 = { @@ -15605,7 +15604,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'), @@ -15693,7 +15692,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}") @@ -15703,14 +15702,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'), @@ -15803,7 +15802,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}") @@ -15815,14 +15814,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'), @@ -15907,7 +15906,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}") @@ -15917,14 +15916,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'), @@ -16045,7 +16044,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}") @@ -16065,14 +16064,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'), @@ -16189,7 +16188,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}") @@ -16216,14 +16215,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'), @@ -16354,7 +16353,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}") @@ -16399,14 +16398,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'), @@ -16490,7 +16489,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}") @@ -16500,14 +16499,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'), @@ -16591,7 +16590,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}") @@ -16601,14 +16600,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'), @@ -16729,7 +16728,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}") @@ -16759,14 +16758,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'), @@ -16886,7 +16885,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}") @@ -16907,14 +16906,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'), @@ -17028,7 +17027,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}") @@ -17049,14 +17048,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'), @@ -17178,7 +17177,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}") @@ -17199,14 +17198,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'), @@ -17298,7 +17297,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}") @@ -17310,14 +17309,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'), @@ -17393,7 +17392,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}") @@ -17403,7 +17402,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'), @@ -17496,7 +17495,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}") @@ -17505,16 +17504,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", @@ -17523,7 +17522,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'), @@ -17620,7 +17619,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}") @@ -17629,10 +17628,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 = { @@ -17642,7 +17641,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'), @@ -17719,7 +17718,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}") @@ -17729,7 +17728,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'), @@ -17823,7 +17822,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}") @@ -17831,7 +17830,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", @@ -17840,7 +17839,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'), @@ -17930,7 +17929,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}") @@ -17939,10 +17938,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 = { @@ -17951,7 +17950,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'), @@ -18049,7 +18048,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}") @@ -18058,10 +18057,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 = { @@ -18071,7 +18070,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'), @@ -18167,7 +18166,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}") @@ -18176,10 +18175,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 = { @@ -18189,7 +18188,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'), @@ -18282,7 +18281,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}") @@ -18292,10 +18291,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 = { @@ -18304,7 +18303,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'), @@ -18401,7 +18400,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}") @@ -18410,10 +18409,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 = { @@ -18423,7 +18422,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'), @@ -18521,7 +18520,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}") @@ -18530,10 +18529,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 = { @@ -18543,7 +18542,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'), @@ -18634,7 +18633,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}") @@ -18643,10 +18642,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 = { @@ -18655,7 +18654,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'), @@ -18748,7 +18747,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}") @@ -18758,10 +18757,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 = { @@ -18770,7 +18769,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'), @@ -18867,7 +18866,7 @@ def update_saved_query(self, saved_query_id, update_saved_query_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_saved_query got unknown kwargs: {extra_kwargs!r}") @@ -18876,10 +18875,10 @@ def update_saved_query(self, saved_query_id, update_saved_query_details, **kwarg "savedQueryId": saved_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 = { @@ -18889,7 +18888,7 @@ def update_saved_query(self, saved_query_id, update_saved_query_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'), @@ -18980,7 +18979,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}") @@ -18989,10 +18988,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 = { @@ -19001,7 +19000,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'), @@ -19091,7 +19090,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}") @@ -19100,10 +19099,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 = { @@ -19112,7 +19111,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'), @@ -19202,7 +19201,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}") @@ -19211,10 +19210,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 = { @@ -19223,7 +19222,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'), @@ -19316,7 +19315,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}") @@ -19326,10 +19325,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 = { @@ -19338,7 +19337,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'), @@ -19433,7 +19432,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}") @@ -19444,10 +19443,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 = { @@ -19456,7 +19455,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'), @@ -19551,7 +19550,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}") @@ -19561,10 +19560,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 = { @@ -19573,7 +19572,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'), @@ -19672,7 +19671,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}") @@ -19683,10 +19682,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 = { @@ -19695,7 +19694,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'), @@ -19792,7 +19791,7 @@ def update_wlp_agent(self, wlp_agent_id, update_wlp_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_wlp_agent got unknown kwargs: {extra_kwargs!r}") @@ -19801,10 +19800,10 @@ def update_wlp_agent(self, wlp_agent_id, update_wlp_agent_details, **kwargs): "wlpAgentId": wlp_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 = { @@ -19814,7 +19813,7 @@ def update_wlp_agent(self, wlp_agent_id, update_wlp_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'), diff --git a/src/oci/cloud_migrations/migration_client.py b/src/oci/cloud_migrations/migration_client.py index 35a91233ef..488d3d14bc 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 @@ -169,7 +168,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}") @@ -178,10 +177,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 = { @@ -190,7 +189,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'), @@ -285,7 +284,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}") @@ -294,10 +293,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 = { @@ -307,7 +306,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'), @@ -405,7 +404,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}") @@ -414,10 +413,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 = { @@ -427,7 +426,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'), @@ -525,7 +524,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}") @@ -534,10 +533,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 = { @@ -547,7 +546,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'), @@ -634,7 +633,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}") @@ -645,7 +644,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'), @@ -732,7 +731,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}") @@ -743,7 +742,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'), @@ -830,7 +829,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}") @@ -841,7 +840,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'), @@ -928,7 +927,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}") @@ -939,7 +938,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'), @@ -1026,7 +1025,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}") @@ -1037,7 +1036,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'), @@ -1124,7 +1123,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}") @@ -1133,10 +1132,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 = { @@ -1145,7 +1144,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'), @@ -1229,7 +1228,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}") @@ -1238,10 +1237,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 = { @@ -1250,7 +1249,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'), @@ -1334,7 +1333,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}") @@ -1343,10 +1342,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 = { @@ -1355,7 +1354,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'), @@ -1439,7 +1438,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}") @@ -1448,10 +1447,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 = { @@ -1460,7 +1459,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'), @@ -1544,7 +1543,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}") @@ -1553,10 +1552,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 = { @@ -1565,7 +1564,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'), @@ -1657,7 +1656,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}") @@ -1666,10 +1665,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 = { @@ -1679,7 +1678,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'), @@ -1756,7 +1755,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}") @@ -1765,10 +1764,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 = { @@ -1776,7 +1775,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'), @@ -1854,7 +1853,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}") @@ -1863,10 +1862,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 = { @@ -1874,7 +1873,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'), @@ -1952,7 +1951,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}") @@ -1961,10 +1960,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 = { @@ -1972,7 +1971,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'), @@ -2050,7 +2049,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}") @@ -2059,10 +2058,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 = { @@ -2070,7 +2069,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'), @@ -2148,7 +2147,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}") @@ -2157,10 +2156,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 = { @@ -2168,7 +2167,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'), @@ -2246,7 +2245,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}") @@ -2255,10 +2254,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 = { @@ -2266,7 +2265,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'), @@ -2344,7 +2343,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}") @@ -2353,10 +2352,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 = { @@ -2364,7 +2363,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'), @@ -2442,7 +2441,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}") @@ -2451,10 +2450,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 = { @@ -2462,7 +2461,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'), @@ -2567,7 +2566,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}") @@ -2576,10 +2575,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 = { @@ -2588,7 +2587,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: @@ -2597,7 +2596,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.') @@ -2724,7 +2723,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}") @@ -2733,10 +2732,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: @@ -2763,14 +2762,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'), @@ -2885,7 +2884,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}") @@ -2921,14 +2920,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'), @@ -3045,7 +3044,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}") @@ -3082,14 +3081,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'), @@ -3202,7 +3201,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}") @@ -3238,14 +3237,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'), @@ -3358,7 +3357,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}") @@ -3394,14 +3393,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'), @@ -3514,7 +3513,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}") @@ -3550,14 +3549,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'), @@ -3655,7 +3654,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}") @@ -3664,10 +3663,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: @@ -3690,14 +3689,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'), @@ -3797,7 +3796,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}") @@ -3806,10 +3805,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: @@ -3832,14 +3831,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'), @@ -3960,7 +3959,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}") @@ -4004,14 +4003,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'), @@ -4105,7 +4104,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}") @@ -4114,10 +4113,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 = { @@ -4127,7 +4126,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'), @@ -4220,7 +4219,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}") @@ -4229,10 +4228,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 = { @@ -4242,7 +4241,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'), @@ -4335,7 +4334,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}") @@ -4344,10 +4343,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 = { @@ -4357,7 +4356,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'), @@ -4450,7 +4449,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}") @@ -4459,10 +4458,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 = { @@ -4472,7 +4471,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'), @@ -4565,7 +4564,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}") @@ -4574,10 +4573,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 = { @@ -4587,7 +4586,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'), @@ -4675,7 +4674,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}") @@ -4684,10 +4683,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 = { @@ -4696,7 +4695,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'), @@ -4787,7 +4786,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}") @@ -4796,10 +4795,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 = { @@ -4808,7 +4807,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'), @@ -4907,7 +4906,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}") @@ -4916,10 +4915,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 = { @@ -4929,7 +4928,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'), @@ -5027,7 +5026,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}") @@ -5036,10 +5035,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 = { @@ -5049,7 +5048,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'), @@ -5147,7 +5146,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}") @@ -5156,10 +5155,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 = { @@ -5169,7 +5168,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/cluster_placement_groups/cluster_placement_groups_cp_client.py b/src/oci/cluster_placement_groups/cluster_placement_groups_cp_client.py index 9c8756b367..2097d4721b 100644 --- a/src/oci/cluster_placement_groups/cluster_placement_groups_cp_client.py +++ b/src/oci/cluster_placement_groups/cluster_placement_groups_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 @@ -176,7 +175,7 @@ def activate_cluster_placement_group(self, cluster_placement_group_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"activate_cluster_placement_group got unknown kwargs: {extra_kwargs!r}") @@ -185,10 +184,10 @@ def activate_cluster_placement_group(self, cluster_placement_group_id, **kwargs) "clusterPlacementGroupId": cluster_placement_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 = { @@ -198,7 +197,7 @@ def activate_cluster_placement_group(self, cluster_placement_group_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'), @@ -285,7 +284,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}") @@ -294,10 +293,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 = { @@ -306,7 +305,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'), @@ -406,7 +405,7 @@ def change_cluster_placement_group_compartment(self, cluster_placement_group_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_cluster_placement_group_compartment got unknown kwargs: {extra_kwargs!r}") @@ -415,10 +414,10 @@ def change_cluster_placement_group_compartment(self, cluster_placement_group_id, "clusterPlacementGroupId": cluster_placement_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 = { @@ -428,7 +427,7 @@ def change_cluster_placement_group_compartment(self, cluster_placement_group_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'), @@ -519,7 +518,7 @@ def create_cluster_placement_group(self, create_cluster_placement_group_details, "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_cluster_placement_group got unknown kwargs: {extra_kwargs!r}") @@ -531,7 +530,7 @@ def create_cluster_placement_group(self, create_cluster_placement_group_details, "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'), @@ -626,7 +625,7 @@ def deactivate_cluster_placement_group(self, cluster_placement_group_id, **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"deactivate_cluster_placement_group got unknown kwargs: {extra_kwargs!r}") @@ -635,10 +634,10 @@ def deactivate_cluster_placement_group(self, cluster_placement_group_id, **kwarg "clusterPlacementGroupId": cluster_placement_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 = { @@ -648,7 +647,7 @@ def deactivate_cluster_placement_group(self, cluster_placement_group_id, **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'), @@ -735,7 +734,7 @@ def delete_cluster_placement_group(self, cluster_placement_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_cluster_placement_group got unknown kwargs: {extra_kwargs!r}") @@ -744,10 +743,10 @@ def delete_cluster_placement_group(self, cluster_placement_group_id, **kwargs): "clusterPlacementGroupId": cluster_placement_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 = { @@ -756,7 +755,7 @@ def delete_cluster_placement_group(self, cluster_placement_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'), @@ -832,7 +831,7 @@ def get_cluster_placement_group(self, cluster_placement_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_cluster_placement_group got unknown kwargs: {extra_kwargs!r}") @@ -841,10 +840,10 @@ def get_cluster_placement_group(self, cluster_placement_group_id, **kwargs): "clusterPlacementGroupId": cluster_placement_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 = { @@ -852,7 +851,7 @@ def get_cluster_placement_group(self, cluster_placement_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'), @@ -930,7 +929,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}") @@ -939,10 +938,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 = { @@ -950,7 +949,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'), @@ -1073,7 +1072,7 @@ def list_cluster_placement_groups(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_cluster_placement_groups got unknown kwargs: {extra_kwargs!r}") @@ -1111,14 +1110,14 @@ def list_cluster_placement_groups(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'), @@ -1216,7 +1215,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}") @@ -1225,10 +1224,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: @@ -1251,14 +1250,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'), @@ -1358,7 +1357,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}") @@ -1367,10 +1366,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: @@ -1393,14 +1392,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'), @@ -1517,7 +1516,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}") @@ -1553,14 +1552,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'), @@ -1649,7 +1648,7 @@ def update_cluster_placement_group(self, cluster_placement_group_id, update_clus "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_placement_group got unknown kwargs: {extra_kwargs!r}") @@ -1658,10 +1657,10 @@ def update_cluster_placement_group(self, cluster_placement_group_id, update_clus "clusterPlacementGroupId": cluster_placement_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 = { @@ -1670,7 +1669,7 @@ def update_cluster_placement_group(self, cluster_placement_group_id, update_clus "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 2d54322be1..a9917ca8d8 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 @@ -188,7 +187,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}") @@ -197,10 +196,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 = { @@ -210,7 +209,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'), @@ -319,7 +318,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}") @@ -328,10 +327,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 = { @@ -341,7 +340,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'), @@ -431,7 +430,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}") @@ -442,7 +441,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'), @@ -531,7 +530,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}") @@ -542,7 +541,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'), @@ -637,7 +636,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}") @@ -646,10 +645,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 = { @@ -658,7 +657,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'), @@ -748,7 +747,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}") @@ -757,10 +756,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 = { @@ -769,7 +768,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'), @@ -851,7 +850,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}") @@ -860,10 +859,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 = { @@ -871,7 +870,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'), @@ -957,7 +956,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}") @@ -966,10 +965,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 = { @@ -977,7 +976,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'), @@ -1118,7 +1117,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}") @@ -1164,14 +1163,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'), @@ -1312,7 +1311,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}") @@ -1358,14 +1357,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'), @@ -1459,7 +1458,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}") @@ -1468,10 +1467,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 = { @@ -1480,7 +1479,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'), @@ -1574,7 +1573,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}") @@ -1583,10 +1582,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 = { @@ -1595,7 +1594,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 a5493665a7..371bb585b7 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 @@ -174,7 +173,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}") @@ -183,10 +182,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 = { @@ -195,7 +194,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'), @@ -284,7 +283,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}") @@ -295,7 +294,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'), @@ -375,7 +374,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}") @@ -384,10 +383,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 = { @@ -395,7 +394,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'), @@ -479,7 +478,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}") @@ -488,23 +487,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'), @@ -632,7 +631,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}") @@ -667,14 +666,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'), @@ -788,7 +787,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}") @@ -814,14 +813,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 5f4c14229b..e21a84b448 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 @@ -172,7 +171,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}") @@ -182,23 +181,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'), @@ -330,7 +329,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}") @@ -339,10 +338,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: @@ -375,14 +374,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 4bac07fce6..841c77aa45 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 @@ -218,7 +217,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}") @@ -247,14 +246,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 f7b30a2834..059c234e15 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 f3de03eee9..8a1e1a2b93 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 @@ -172,7 +171,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}") @@ -181,10 +180,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 = { @@ -193,7 +192,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'), @@ -283,7 +282,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}") @@ -292,10 +291,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 = { @@ -305,7 +304,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'), @@ -388,7 +387,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}") @@ -399,7 +398,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'), @@ -481,7 +480,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}") @@ -490,10 +489,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 = { @@ -501,7 +500,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'), @@ -587,7 +586,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}") @@ -598,7 +597,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'), @@ -681,7 +680,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}") @@ -692,7 +691,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'), @@ -778,7 +777,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}") @@ -787,10 +786,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 = { @@ -799,7 +798,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'), @@ -887,7 +886,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}") @@ -896,10 +895,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 = { @@ -908,7 +907,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'), @@ -1007,7 +1006,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}") @@ -1017,10 +1016,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 = { @@ -1028,7 +1027,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", @@ -1036,7 +1035,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'), @@ -1130,7 +1129,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}") @@ -1139,17 +1138,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", @@ -1157,7 +1156,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'), @@ -1251,7 +1250,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}") @@ -1260,17 +1259,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", @@ -1278,7 +1277,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'), @@ -1363,7 +1362,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}") @@ -1372,10 +1371,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 = { @@ -1384,7 +1383,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'), @@ -1470,7 +1469,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}") @@ -1480,10 +1479,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 = { @@ -1492,7 +1491,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'), @@ -1581,7 +1580,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}") @@ -1591,16 +1590,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", @@ -1608,7 +1607,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'), @@ -1690,7 +1689,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}") @@ -1700,10 +1699,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 = { @@ -1711,7 +1710,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'), @@ -1794,7 +1793,7 @@ def get_cluster(self, cluster_id, **kwargs): "opc_request_id", "should_include_oidc_config_file" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -1803,23 +1802,23 @@ 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') query_params = { "shouldIncludeOidcConfigFile": kwargs.get("should_include_oidc_config_file", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -1909,10 +1908,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 = { @@ -1920,7 +1919,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'), @@ -2007,7 +2006,7 @@ def get_cluster_options(self, cluster_option_id, **kwargs): "should_list_all_patch_versions", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -2016,24 +2015,24 @@ 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), "shouldListAllPatchVersions": kwargs.get("should_list_all_patch_versions", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -2123,10 +2122,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 = { @@ -2134,7 +2133,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'), @@ -2213,7 +2212,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}") @@ -2222,10 +2221,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 = { @@ -2233,7 +2232,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'), @@ -2336,7 +2335,7 @@ def get_node_pool_options(self, node_pool_option_id, **kwargs): "node_pool_k8s_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"get_node_pool_options got unknown kwargs: {extra_kwargs!r}") @@ -2345,10 +2344,10 @@ 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') if 'node_pool_os_type' in kwargs: @@ -2372,14 +2371,14 @@ def get_node_pool_options(self, node_pool_option_id, **kwargs): "nodePoolOsArch": kwargs.get("node_pool_os_arch", missing), "nodePoolK8sVersion": kwargs.get("node_pool_k8s_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'), @@ -2463,7 +2462,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}") @@ -2473,10 +2472,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 = { @@ -2484,7 +2483,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'), @@ -2563,7 +2562,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}") @@ -2572,10 +2571,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 = { @@ -2583,7 +2582,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'), @@ -2662,7 +2661,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}") @@ -2671,10 +2670,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 = { @@ -2682,7 +2681,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'), @@ -2764,7 +2763,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}") @@ -2774,10 +2773,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 = { @@ -2785,7 +2784,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'), @@ -2878,7 +2877,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}") @@ -2887,10 +2886,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 = { @@ -2900,7 +2899,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'), @@ -3016,7 +3015,7 @@ def list_addon_options(self, kubernetes_version, **kwargs): "sort_by", "should_show_all_versions" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -3044,14 +3043,14 @@ def list_addon_options(self, kubernetes_version, **kwargs): "sortBy": kwargs.get("sort_by", missing), "shouldShowAllVersions": kwargs.get("should_show_all_versions", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3157,7 +3156,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}") @@ -3166,10 +3165,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: @@ -3192,14 +3191,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'), @@ -3319,7 +3318,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}") @@ -3355,14 +3354,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'), @@ -3484,7 +3483,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}") @@ -3521,14 +3520,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'), @@ -3642,7 +3641,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}") @@ -3670,14 +3669,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'), @@ -3797,7 +3796,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}") @@ -3834,14 +3833,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'), @@ -3951,7 +3950,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}") @@ -3960,10 +3959,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: @@ -3987,14 +3986,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'), @@ -4078,7 +4077,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}") @@ -4087,23 +4086,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'), @@ -4187,7 +4186,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}") @@ -4196,23 +4195,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'), @@ -4338,7 +4337,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}") @@ -4375,14 +4374,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'), @@ -4488,7 +4487,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}") @@ -4497,10 +4496,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: @@ -4523,14 +4522,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'), @@ -4622,7 +4621,7 @@ def reboot_cluster_node(self, cluster_id, node_id, reboot_cluster_node_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"reboot_cluster_node got unknown kwargs: {extra_kwargs!r}") @@ -4632,10 +4631,10 @@ def reboot_cluster_node(self, cluster_id, node_id, reboot_cluster_node_details, "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') header_params = { @@ -4644,7 +4643,7 @@ def reboot_cluster_node(self, cluster_id, node_id, reboot_cluster_node_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'), @@ -4735,7 +4734,7 @@ def replace_boot_volume_cluster_node(self, cluster_id, node_id, replace_boot_vol "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_boot_volume_cluster_node got unknown kwargs: {extra_kwargs!r}") @@ -4745,10 +4744,10 @@ def replace_boot_volume_cluster_node(self, cluster_id, node_id, replace_boot_vol "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') header_params = { @@ -4757,7 +4756,7 @@ def replace_boot_volume_cluster_node(self, cluster_id, node_id, replace_boot_vol "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -4860,10 +4859,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 = { @@ -4873,7 +4872,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'), @@ -4965,7 +4964,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}") @@ -4975,10 +4974,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 = { @@ -4987,7 +4986,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'), @@ -5075,7 +5074,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}") @@ -5084,10 +5083,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 = { @@ -5096,7 +5095,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'), @@ -5184,7 +5183,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}") @@ -5193,10 +5192,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 = { @@ -5205,7 +5204,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'), @@ -5302,7 +5301,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}") @@ -5311,17 +5310,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", @@ -5329,7 +5328,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'), @@ -5419,7 +5418,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}") @@ -5428,10 +5427,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 = { @@ -5440,7 +5439,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'), @@ -5531,7 +5530,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}") @@ -5541,10 +5540,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 = { @@ -5553,7 +5552,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 8bfed8060f..eb237cbfb1 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 @@ -173,7 +172,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}") @@ -182,10 +181,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 = { @@ -194,7 +193,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'), @@ -280,7 +279,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}") @@ -291,7 +290,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'), @@ -380,7 +379,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}") @@ -389,10 +388,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 = { @@ -401,7 +400,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'), @@ -479,7 +478,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}") @@ -488,10 +487,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 = { @@ -499,7 +498,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'), @@ -579,7 +578,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}") @@ -588,10 +587,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 = { @@ -599,7 +598,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'), @@ -677,7 +676,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}") @@ -686,10 +685,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 = { @@ -697,7 +696,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'), @@ -795,7 +794,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}") @@ -806,14 +805,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'), @@ -933,7 +932,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}") @@ -969,14 +968,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'), @@ -1102,7 +1101,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}") @@ -1139,14 +1138,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'), @@ -1248,7 +1247,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}") @@ -1257,10 +1256,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: @@ -1283,14 +1282,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'), @@ -1394,7 +1393,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}") @@ -1403,10 +1402,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: @@ -1429,14 +1428,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'), @@ -1562,7 +1561,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}") @@ -1599,14 +1598,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'), @@ -1694,7 +1693,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}") @@ -1703,10 +1702,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 = { @@ -1715,7 +1714,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'), @@ -1798,7 +1797,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}") @@ -1807,23 +1806,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'), @@ -1913,7 +1912,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}") @@ -1922,10 +1921,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 = { @@ -1934,7 +1933,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'), @@ -2020,7 +2019,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}") @@ -2029,10 +2028,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 = { @@ -2041,7 +2040,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'), @@ -2130,7 +2129,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}") @@ -2139,10 +2138,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 = { @@ -2151,7 +2150,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'), @@ -2242,7 +2241,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}") @@ -2251,10 +2250,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 = { @@ -2263,7 +2262,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 738c5380d2..5d8458d5c2 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 @@ -176,7 +175,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}") @@ -185,10 +184,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 = { @@ -196,7 +195,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'), @@ -280,7 +279,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}") @@ -289,10 +288,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 = { @@ -300,7 +299,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'), @@ -384,7 +383,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}") @@ -393,10 +392,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 = { @@ -404,7 +403,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'), @@ -488,7 +487,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}") @@ -497,10 +496,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 = { @@ -508,7 +507,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'), @@ -592,7 +591,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}") @@ -601,10 +600,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 = { @@ -612,7 +611,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'), @@ -696,7 +695,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}") @@ -705,10 +704,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 = { @@ -716,7 +715,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'), @@ -807,7 +806,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}") @@ -816,10 +815,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 = { @@ -828,7 +827,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'), @@ -922,7 +921,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}") @@ -931,10 +930,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 = { @@ -943,7 +942,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'), @@ -1037,7 +1036,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}") @@ -1046,10 +1045,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 = { @@ -1058,7 +1057,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'), @@ -1146,7 +1145,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}") @@ -1156,7 +1155,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'), @@ -1244,7 +1243,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}") @@ -1254,7 +1253,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'), @@ -1352,7 +1351,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}") @@ -1362,7 +1361,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'), @@ -1450,7 +1449,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}") @@ -1460,7 +1459,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'), @@ -1551,7 +1550,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}") @@ -1562,7 +1561,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'), @@ -1633,7 +1632,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}") @@ -1729,7 +1728,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}") @@ -1739,7 +1738,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'), @@ -1823,7 +1822,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}") @@ -1833,7 +1832,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'), @@ -1917,7 +1916,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}") @@ -1926,10 +1925,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 = { @@ -1937,7 +1936,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'), @@ -2013,7 +2012,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}") @@ -2022,10 +2021,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 = { @@ -2033,7 +2032,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'), @@ -2109,7 +2108,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}") @@ -2118,10 +2117,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 = { @@ -2129,7 +2128,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'), @@ -2210,7 +2209,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}") @@ -2219,10 +2218,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 = { @@ -2230,7 +2229,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'), @@ -2306,7 +2305,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}") @@ -2315,10 +2314,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 = { @@ -2326,7 +2325,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'), @@ -2413,7 +2412,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}") @@ -2422,10 +2421,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 = { @@ -2434,7 +2433,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'), @@ -2510,7 +2509,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}") @@ -2519,10 +2518,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 = { @@ -2530,7 +2529,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'), @@ -2609,7 +2608,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}") @@ -2618,10 +2617,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 = { @@ -2629,7 +2628,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'), @@ -2708,7 +2707,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}") @@ -2717,10 +2716,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 = { @@ -2728,7 +2727,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'), @@ -2804,7 +2803,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}") @@ -2813,10 +2812,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 = { @@ -2824,7 +2823,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'), @@ -2890,7 +2889,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}") @@ -2899,10 +2898,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 = { @@ -2976,7 +2975,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}") @@ -2985,10 +2984,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 = { @@ -3062,7 +3061,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}") @@ -3071,10 +3070,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 = { @@ -3158,7 +3157,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}") @@ -3167,10 +3166,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 = { @@ -3178,7 +3177,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'), @@ -3246,7 +3245,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}") @@ -3255,10 +3254,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 = { @@ -3332,7 +3331,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}") @@ -3341,10 +3340,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 = { @@ -3418,7 +3417,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}") @@ -3427,10 +3426,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 = { @@ -3504,7 +3503,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}") @@ -3513,10 +3512,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 = { @@ -3614,7 +3613,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}") @@ -3624,7 +3623,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", @@ -3697,7 +3696,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}") @@ -3706,10 +3705,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 = { @@ -3785,7 +3784,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}") @@ -3794,10 +3793,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 = { @@ -3873,7 +3872,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}") @@ -3882,10 +3881,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 = { @@ -3959,7 +3958,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}") @@ -3968,10 +3967,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 = { @@ -4055,7 +4054,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}") @@ -4064,10 +4063,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 = { @@ -4075,7 +4074,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'), @@ -4208,7 +4207,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}") @@ -4245,7 +4244,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", @@ -4381,7 +4380,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}") @@ -4418,7 +4417,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", @@ -4556,7 +4555,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}") @@ -4593,7 +4592,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", @@ -4701,7 +4700,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}") @@ -4713,7 +4712,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", @@ -4815,7 +4814,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}") @@ -4825,7 +4824,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", @@ -4961,7 +4960,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}") @@ -4998,7 +4997,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", @@ -5126,7 +5125,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}") @@ -5154,7 +5153,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", @@ -5289,7 +5288,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}") @@ -5325,7 +5324,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", @@ -5462,7 +5461,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}") @@ -5498,7 +5497,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", @@ -5641,7 +5640,7 @@ def list_volumes(self, **kwargs): "cluster_placement_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}") @@ -5679,7 +5678,7 @@ def list_volumes(self, **kwargs): "clusterPlacementGroupId": kwargs.get("cluster_placement_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", @@ -5765,7 +5764,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}") @@ -5774,10 +5773,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 = { @@ -5785,7 +5784,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'), @@ -5869,7 +5868,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}") @@ -5878,10 +5877,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 = { @@ -5889,7 +5888,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'), @@ -5972,7 +5971,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}") @@ -5981,10 +5980,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 = { @@ -5992,7 +5991,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'), @@ -6076,7 +6075,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}") @@ -6085,10 +6084,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 = { @@ -6096,7 +6095,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'), @@ -6180,7 +6179,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}") @@ -6189,10 +6188,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 = { @@ -6200,7 +6199,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'), @@ -6302,7 +6301,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}") @@ -6311,10 +6310,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 = { @@ -6324,7 +6323,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'), @@ -6421,7 +6420,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}") @@ -6430,23 +6429,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'), @@ -6533,7 +6532,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}") @@ -6542,10 +6541,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 = { @@ -6553,7 +6552,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'), @@ -6636,7 +6635,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}") @@ -6645,10 +6644,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 = { @@ -6656,7 +6655,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 a956d6ae38..4e4e6bfdda 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 @@ -183,7 +182,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}") @@ -192,10 +191,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 = { @@ -205,7 +204,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'), @@ -285,7 +284,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}") @@ -295,10 +294,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 = { @@ -386,7 +385,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}") @@ -396,7 +395,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'), @@ -495,7 +494,7 @@ def attach_compute_host_group_host(self, compute_host_id, attach_compute_host_gr "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_compute_host_group_host got unknown kwargs: {extra_kwargs!r}") @@ -504,10 +503,10 @@ def attach_compute_host_group_host(self, compute_host_id, attach_compute_host_gr "computeHostId": compute_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 = { @@ -517,7 +516,7 @@ def attach_compute_host_group_host(self, compute_host_id, attach_compute_host_gr "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -606,7 +605,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}") @@ -616,7 +615,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'), @@ -697,7 +696,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}") @@ -707,7 +706,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'), @@ -804,7 +803,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}") @@ -814,7 +813,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'), @@ -913,7 +912,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}") @@ -922,10 +921,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 = { @@ -935,7 +934,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'), @@ -1035,7 +1034,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}") @@ -1044,10 +1043,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 = { @@ -1057,7 +1056,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'), @@ -1166,7 +1165,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}") @@ -1175,10 +1174,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 = { @@ -1188,7 +1187,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'), @@ -1286,7 +1285,7 @@ def change_compute_gpu_memory_cluster_compartment(self, compute_gpu_memory_clust "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_gpu_memory_cluster_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1295,10 +1294,10 @@ def change_compute_gpu_memory_cluster_compartment(self, compute_gpu_memory_clust "computeGpuMemoryClusterId": compute_gpu_memory_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 = { @@ -1308,7 +1307,7 @@ def change_compute_gpu_memory_cluster_compartment(self, compute_gpu_memory_clust "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1408,7 +1407,7 @@ def change_compute_gpu_memory_fabric_compartment(self, compute_gpu_memory_fabric "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_gpu_memory_fabric_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1417,10 +1416,10 @@ def change_compute_gpu_memory_fabric_compartment(self, compute_gpu_memory_fabric "computeGpuMemoryFabricId": compute_gpu_memory_fabric_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1430,7 +1429,7 @@ def change_compute_gpu_memory_fabric_compartment(self, compute_gpu_memory_fabric "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 change_compute_host_compartment(self, compute_host_id, change_compute_host_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_compute_host_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1541,10 +1540,10 @@ def change_compute_host_compartment(self, compute_host_id, change_compute_host_c "computeHostId": compute_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 = { @@ -1554,7 +1553,7 @@ def change_compute_host_compartment(self, compute_host_id, change_compute_host_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'), @@ -1656,7 +1655,7 @@ def change_compute_host_group_compartment(self, compute_host_group_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_compute_host_group_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1665,10 +1664,10 @@ def change_compute_host_group_compartment(self, compute_host_group_id, change_co "computeHostGroupId": compute_host_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 = { @@ -1678,7 +1677,7 @@ def change_compute_host_group_compartment(self, compute_host_group_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'), @@ -1779,7 +1778,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}") @@ -1788,10 +1787,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 = { @@ -1801,7 +1800,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'), @@ -1898,7 +1897,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}") @@ -1907,10 +1906,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 = { @@ -1920,7 +1919,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'), @@ -2021,7 +2020,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}") @@ -2030,10 +2029,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 = { @@ -2043,7 +2042,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'), @@ -2149,7 +2148,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}") @@ -2158,10 +2157,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 = { @@ -2171,7 +2170,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'), @@ -2252,7 +2251,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}") @@ -2262,7 +2261,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'), @@ -2355,7 +2354,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}") @@ -2366,7 +2365,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'), @@ -2462,7 +2461,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}") @@ -2473,7 +2472,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'), @@ -2564,7 +2563,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}") @@ -2575,7 +2574,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'), @@ -2688,7 +2687,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}") @@ -2699,7 +2698,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'), @@ -2785,7 +2784,7 @@ def create_compute_gpu_memory_cluster(self, create_compute_gpu_memory_cluster_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_compute_gpu_memory_cluster got unknown kwargs: {extra_kwargs!r}") @@ -2796,7 +2795,7 @@ def create_compute_gpu_memory_cluster(self, create_compute_gpu_memory_cluster_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'), @@ -2884,7 +2883,7 @@ def create_compute_host_group(self, create_compute_host_group_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_compute_host_group got unknown kwargs: {extra_kwargs!r}") @@ -2895,7 +2894,7 @@ def create_compute_host_group(self, create_compute_host_group_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'), @@ -2978,7 +2977,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}") @@ -2988,7 +2987,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'), @@ -3081,7 +3080,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}") @@ -3092,7 +3091,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'), @@ -3200,7 +3199,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}") @@ -3210,7 +3209,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'), @@ -3299,7 +3298,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}") @@ -3309,7 +3308,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'), @@ -3386,7 +3385,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}") @@ -3396,7 +3395,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", @@ -3482,7 +3481,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}") @@ -3491,10 +3490,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 = { @@ -3503,7 +3502,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'), @@ -3586,7 +3585,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}") @@ -3595,10 +3594,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 = { @@ -3607,7 +3606,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'), @@ -3701,7 +3700,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}") @@ -3710,10 +3709,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 = { @@ -3722,7 +3721,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'), @@ -3803,7 +3802,7 @@ def delete_compute_gpu_memory_cluster(self, compute_gpu_memory_cluster_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_compute_gpu_memory_cluster got unknown kwargs: {extra_kwargs!r}") @@ -3812,10 +3811,10 @@ def delete_compute_gpu_memory_cluster(self, compute_gpu_memory_cluster_id, **kwa "computeGpuMemoryClusterId": compute_gpu_memory_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 = { @@ -3824,7 +3823,7 @@ def delete_compute_gpu_memory_cluster(self, compute_gpu_memory_cluster_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'), @@ -3909,7 +3908,7 @@ def delete_compute_host_group(self, compute_host_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_compute_host_group got unknown kwargs: {extra_kwargs!r}") @@ -3918,10 +3917,10 @@ def delete_compute_host_group(self, compute_host_group_id, **kwargs): "computeHostGroupId": compute_host_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 = { @@ -3930,7 +3929,7 @@ def delete_compute_host_group(self, compute_host_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'), @@ -4006,7 +4005,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}") @@ -4015,10 +4014,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 = { @@ -4026,7 +4025,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'), @@ -4102,7 +4101,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}") @@ -4111,10 +4110,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 = { @@ -4122,7 +4121,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'), @@ -4200,7 +4199,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}") @@ -4209,10 +4208,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 = { @@ -4220,7 +4219,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'), @@ -4298,7 +4297,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}") @@ -4307,10 +4306,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 = { @@ -4318,7 +4317,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'), @@ -4394,7 +4393,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}") @@ -4403,10 +4402,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 = { @@ -4414,7 +4413,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'), @@ -4493,7 +4492,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}") @@ -4502,10 +4501,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 = { @@ -4513,7 +4512,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'), @@ -4609,7 +4608,7 @@ def detach_compute_host_group_host(self, compute_host_id, detach_compute_host_gr "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_compute_host_group_host got unknown kwargs: {extra_kwargs!r}") @@ -4618,10 +4617,10 @@ def detach_compute_host_group_host(self, compute_host_id, detach_compute_host_gr "computeHostId": compute_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 = { @@ -4631,7 +4630,7 @@ def detach_compute_host_group_host(self, compute_host_id, detach_compute_host_gr "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4723,7 +4722,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}") @@ -4732,10 +4731,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 = { @@ -4743,7 +4742,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'), @@ -4822,7 +4821,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}") @@ -4831,10 +4830,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 = { @@ -4842,7 +4841,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'), @@ -4945,7 +4944,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}") @@ -4954,10 +4953,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 = { @@ -4966,7 +4965,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'), @@ -5039,7 +5038,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}") @@ -5048,10 +5047,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 = { @@ -5130,7 +5129,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}") @@ -5140,10 +5139,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 = { @@ -5222,7 +5221,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}") @@ -5232,10 +5231,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 = { @@ -5311,7 +5310,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}") @@ -5320,10 +5319,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 = { @@ -5406,7 +5405,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}") @@ -5415,10 +5414,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 = { @@ -5426,7 +5425,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'), @@ -5505,7 +5504,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}") @@ -5514,10 +5513,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 = { @@ -5525,7 +5524,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'), @@ -5612,7 +5611,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}") @@ -5621,10 +5620,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 = { @@ -5632,7 +5631,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'), @@ -5702,7 +5701,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}") @@ -5711,10 +5710,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 = { @@ -5795,7 +5794,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}") @@ -5805,10 +5804,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 = { @@ -5893,7 +5892,7 @@ def get_compute_gpu_memory_cluster(self, compute_gpu_memory_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_gpu_memory_cluster got unknown kwargs: {extra_kwargs!r}") @@ -5902,10 +5901,10 @@ def get_compute_gpu_memory_cluster(self, compute_gpu_memory_cluster_id, **kwargs "computeGpuMemoryClusterId": compute_gpu_memory_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 = { @@ -5913,7 +5912,7 @@ def get_compute_gpu_memory_cluster(self, compute_gpu_memory_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'), @@ -5990,7 +5989,7 @@ def get_compute_gpu_memory_fabric(self, compute_gpu_memory_fabric_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_gpu_memory_fabric got unknown kwargs: {extra_kwargs!r}") @@ -5999,10 +5998,10 @@ def get_compute_gpu_memory_fabric(self, compute_gpu_memory_fabric_id, **kwargs): "computeGpuMemoryFabricId": compute_gpu_memory_fabric_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6010,7 +6009,7 @@ def get_compute_gpu_memory_fabric(self, compute_gpu_memory_fabric_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6091,7 +6090,7 @@ def get_compute_host(self, compute_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_compute_host got unknown kwargs: {extra_kwargs!r}") @@ -6100,10 +6099,10 @@ def get_compute_host(self, compute_host_id, **kwargs): "computeHostId": compute_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 = { @@ -6111,7 +6110,7 @@ def get_compute_host(self, compute_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'), @@ -6192,7 +6191,7 @@ def get_compute_host_group(self, compute_host_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_compute_host_group got unknown kwargs: {extra_kwargs!r}") @@ -6201,10 +6200,10 @@ def get_compute_host_group(self, compute_host_group_id, **kwargs): "computeHostGroupId": compute_host_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 = { @@ -6212,7 +6211,7 @@ def get_compute_host_group(self, compute_host_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'), @@ -6290,7 +6289,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}") @@ -6299,16 +6298,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", @@ -6387,7 +6386,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}") @@ -6396,10 +6395,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 = { @@ -6487,7 +6486,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}") @@ -6496,17 +6495,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", @@ -6590,7 +6589,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}") @@ -6599,10 +6598,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 = { @@ -6610,7 +6609,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'), @@ -6680,7 +6679,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}") @@ -6689,10 +6688,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 = { @@ -6782,7 +6781,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}") @@ -6792,10 +6791,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 = { @@ -6803,7 +6802,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'), @@ -6878,7 +6877,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}") @@ -6887,10 +6886,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 = { @@ -6964,7 +6963,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}") @@ -6973,10 +6972,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 = { @@ -7059,7 +7058,7 @@ def get_instance_maintenance_event(self, instance_maintenance_event_id, **kwargs "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_event got unknown kwargs: {extra_kwargs!r}") @@ -7068,10 +7067,10 @@ def get_instance_maintenance_event(self, instance_maintenance_event_id, **kwargs "instanceMaintenanceEventId": instance_maintenance_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') header_params = { @@ -7079,7 +7078,7 @@ def get_instance_maintenance_event(self, instance_maintenance_event_id, **kwargs "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7161,7 +7160,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}") @@ -7170,10 +7169,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 = { @@ -7181,7 +7180,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'), @@ -7260,7 +7259,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}") @@ -7269,10 +7268,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 = { @@ -7280,7 +7279,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'), @@ -7348,7 +7347,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}") @@ -7357,10 +7356,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 = { @@ -7434,7 +7433,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}") @@ -7443,10 +7442,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 = { @@ -7523,7 +7522,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}") @@ -7532,10 +7531,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 = { @@ -7684,7 +7683,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}") @@ -7693,16 +7692,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", @@ -7710,7 +7709,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'), @@ -7848,7 +7847,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}") @@ -7858,7 +7857,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'), @@ -7956,7 +7955,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}") @@ -7965,10 +7964,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: @@ -7983,7 +7982,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", @@ -8098,7 +8097,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}") @@ -8118,7 +8117,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", @@ -8241,7 +8240,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}") @@ -8268,7 +8267,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", @@ -8381,7 +8380,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}") @@ -8394,7 +8393,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", @@ -8526,7 +8525,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}") @@ -8554,14 +8553,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'), @@ -8688,7 +8687,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}") @@ -8697,10 +8696,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: @@ -8725,14 +8724,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'), @@ -8870,7 +8869,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}") @@ -8906,14 +8905,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'), @@ -9041,7 +9040,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}") @@ -9069,14 +9068,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'), @@ -9225,7 +9224,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}") @@ -9234,10 +9233,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: @@ -9265,14 +9264,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'), @@ -9405,7 +9404,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}") @@ -9414,10 +9413,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: @@ -9442,14 +9441,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'), @@ -9588,7 +9587,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}") @@ -9597,10 +9596,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: @@ -9626,14 +9625,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'), @@ -9767,7 +9766,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}") @@ -9795,14 +9794,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'), @@ -9918,7 +9917,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}") @@ -9927,10 +9926,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: @@ -9954,7 +9953,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", @@ -10078,7 +10077,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}") @@ -10105,7 +10104,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", @@ -10227,7 +10226,7 @@ def list_compute_gpu_memory_cluster_instances(self, compute_gpu_memory_cluster_i "sort_order", "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_compute_gpu_memory_cluster_instances got unknown kwargs: {extra_kwargs!r}") @@ -10236,10 +10235,10 @@ def list_compute_gpu_memory_cluster_instances(self, compute_gpu_memory_cluster_i "computeGpuMemoryClusterId": compute_gpu_memory_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: @@ -10262,14 +10261,14 @@ def list_compute_gpu_memory_cluster_instances(self, compute_gpu_memory_cluster_i "sortOrder": kwargs.get("sort_order", 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/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'), @@ -10413,7 +10412,7 @@ def list_compute_gpu_memory_clusters(self, compartment_id, **kwargs): "sort_order", "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_compute_gpu_memory_clusters got unknown kwargs: {extra_kwargs!r}") @@ -10443,14 +10442,14 @@ def list_compute_gpu_memory_clusters(self, compartment_id, **kwargs): "sortOrder": kwargs.get("sort_order", 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/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'), @@ -10607,7 +10606,7 @@ def list_compute_gpu_memory_fabrics(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_gpu_memory_fabrics got unknown kwargs: {extra_kwargs!r}") @@ -10654,14 +10653,14 @@ def list_compute_gpu_memory_fabrics(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'), @@ -10760,7 +10759,7 @@ def list_compute_host_groups(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_compute_host_groups got unknown kwargs: {extra_kwargs!r}") @@ -10770,14 +10769,14 @@ def list_compute_host_groups(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, 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'), @@ -10935,7 +10934,7 @@ def list_compute_hosts(self, compartment_id, **kwargs): "compute_host_group_id", "compute_host_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_compute_hosts got unknown kwargs: {extra_kwargs!r}") @@ -10968,14 +10967,14 @@ def list_compute_hosts(self, compartment_id, **kwargs): "computeHostGroupId": kwargs.get("compute_host_group_id", missing), "computeHostInSubtree": kwargs.get("compute_host_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, 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'), @@ -11098,7 +11097,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}") @@ -11126,7 +11125,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", @@ -11262,7 +11261,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}") @@ -11298,7 +11297,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", @@ -11411,7 +11410,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}") @@ -11423,14 +11422,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'), @@ -11560,7 +11559,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}") @@ -11569,10 +11568,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: @@ -11598,14 +11597,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'), @@ -11714,7 +11713,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}") @@ -11726,14 +11725,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'), @@ -11885,7 +11884,7 @@ def list_dedicated_vm_hosts(self, compartment_id, **kwargs): "remaining_ocpus_greater_than_or_equal_to", "is_memory_encryption_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_dedicated_vm_hosts got unknown kwargs: {extra_kwargs!r}") @@ -11925,14 +11924,14 @@ def list_dedicated_vm_hosts(self, compartment_id, **kwargs): "remainingOcpusGreaterThanOrEqualTo": kwargs.get("remaining_ocpus_greater_than_or_equal_to", missing), "isMemoryEncryptionEnabled": kwargs.get("is_memory_encryption_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, 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'), @@ -12029,7 +12028,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}") @@ -12038,24 +12037,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'), @@ -12211,7 +12210,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}") @@ -12249,7 +12248,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", @@ -12356,7 +12355,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}") @@ -12367,7 +12366,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", @@ -12497,7 +12496,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}") @@ -12506,10 +12505,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: @@ -12534,14 +12533,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'), @@ -12690,7 +12689,7 @@ def list_instance_maintenance_events(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_instance_maintenance_events got unknown kwargs: {extra_kwargs!r}") @@ -12729,14 +12728,14 @@ def list_instance_maintenance_events(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'), @@ -12883,7 +12882,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}") @@ -12921,7 +12920,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", @@ -13031,7 +13030,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}") @@ -13043,7 +13042,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", @@ -13156,7 +13155,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}") @@ -13169,7 +13168,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", @@ -13284,7 +13283,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}") @@ -13297,7 +13296,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", @@ -13375,7 +13374,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}") @@ -13385,10 +13384,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 = { @@ -13502,7 +13501,7 @@ def terminate_instance(self, instance_id, **kwargs): "preserve_data_volumes_created_at_launch", "recycle_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"terminate_instance got unknown kwargs: {extra_kwargs!r}") @@ -13511,10 +13510,10 @@ 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') if 'recycle_level' in kwargs: @@ -13529,14 +13528,14 @@ def terminate_instance(self, instance_id, **kwargs): "preserveDataVolumesCreatedAtLaunch": kwargs.get("preserve_data_volumes_created_at_launch", missing), "recycleLevel": kwargs.get("recycle_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", "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13624,7 +13623,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}") @@ -13633,10 +13632,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 = { @@ -13645,7 +13644,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'), @@ -13733,7 +13732,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}") @@ -13742,10 +13741,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 = { @@ -13754,7 +13753,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'), @@ -13864,7 +13863,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}") @@ -13873,10 +13872,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 = { @@ -13886,7 +13885,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'), @@ -13983,7 +13982,7 @@ def update_compute_gpu_memory_cluster(self, compute_gpu_memory_cluster_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_compute_gpu_memory_cluster got unknown kwargs: {extra_kwargs!r}") @@ -13992,10 +13991,10 @@ def update_compute_gpu_memory_cluster(self, compute_gpu_memory_cluster_id, updat "computeGpuMemoryClusterId": compute_gpu_memory_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 = { @@ -14005,7 +14004,7 @@ def update_compute_gpu_memory_cluster(self, compute_gpu_memory_cluster_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'), @@ -14105,7 +14104,7 @@ def update_compute_gpu_memory_fabric(self, compute_gpu_memory_fabric_id, update_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_gpu_memory_fabric got unknown kwargs: {extra_kwargs!r}") @@ -14114,10 +14113,10 @@ def update_compute_gpu_memory_fabric(self, compute_gpu_memory_fabric_id, update_ "computeGpuMemoryFabricId": compute_gpu_memory_fabric_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14127,7 +14126,7 @@ def update_compute_gpu_memory_fabric(self, compute_gpu_memory_fabric_id, update_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14228,7 +14227,7 @@ def update_compute_host(self, compute_host_id, update_compute_host_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_compute_host got unknown kwargs: {extra_kwargs!r}") @@ -14237,10 +14236,10 @@ def update_compute_host(self, compute_host_id, update_compute_host_details, **kw "computeHostId": compute_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 = { @@ -14250,7 +14249,7 @@ def update_compute_host(self, compute_host_id, update_compute_host_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'), @@ -14349,7 +14348,7 @@ def update_compute_host_group(self, compute_host_group_id, update_compute_host_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"update_compute_host_group got unknown kwargs: {extra_kwargs!r}") @@ -14358,10 +14357,10 @@ def update_compute_host_group(self, compute_host_group_id, update_compute_host_g "computeHostGroupId": compute_host_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 = { @@ -14371,7 +14370,7 @@ def update_compute_host_group(self, compute_host_group_id, update_compute_host_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'), @@ -14457,7 +14456,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}") @@ -14466,10 +14465,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 = { @@ -14477,7 +14476,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'), @@ -14560,7 +14559,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}") @@ -14569,10 +14568,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 = { @@ -14580,7 +14579,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'), @@ -14677,7 +14676,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}") @@ -14686,10 +14685,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 = { @@ -14699,7 +14698,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'), @@ -14793,7 +14792,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}") @@ -14802,10 +14801,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 = { @@ -14814,7 +14813,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'), @@ -14914,7 +14913,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}") @@ -14923,10 +14922,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 = { @@ -14935,7 +14934,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'), @@ -15024,7 +15023,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}") @@ -15033,10 +15032,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 = { @@ -15045,7 +15044,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'), @@ -15141,7 +15140,7 @@ def update_instance_maintenance_event(self, instance_maintenance_event_id, updat "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_instance_maintenance_event got unknown kwargs: {extra_kwargs!r}") @@ -15150,10 +15149,10 @@ def update_instance_maintenance_event(self, instance_maintenance_event_id, updat "instanceMaintenanceEventId": instance_maintenance_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') header_params = { @@ -15163,7 +15162,7 @@ def update_instance_maintenance_event(self, instance_maintenance_event_id, updat "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'), @@ -15252,7 +15251,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}") @@ -15261,10 +15260,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 = { @@ -15273,7 +15272,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 e71db20cc9..062bde042a 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 @@ -181,7 +180,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}") @@ -190,10 +189,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 = { @@ -201,7 +200,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'), @@ -295,7 +294,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}") @@ -304,10 +303,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 = { @@ -316,7 +315,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'), @@ -424,7 +423,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}") @@ -433,10 +432,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 = { @@ -446,7 +445,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'), @@ -556,7 +555,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}") @@ -565,10 +564,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 = { @@ -578,7 +577,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'), @@ -682,7 +681,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}") @@ -691,10 +690,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 = { @@ -704,7 +703,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'), @@ -801,7 +800,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}") @@ -811,7 +810,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'), @@ -893,7 +892,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}") @@ -903,7 +902,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'), @@ -988,7 +987,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}") @@ -998,7 +997,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'), @@ -1077,7 +1076,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}") @@ -1086,10 +1085,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 = { @@ -1097,7 +1096,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'), @@ -1180,7 +1179,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}") @@ -1189,10 +1188,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 = { @@ -1200,7 +1199,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'), @@ -1292,7 +1291,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}") @@ -1301,10 +1300,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 = { @@ -1313,7 +1312,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'), @@ -1388,7 +1387,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}") @@ -1397,10 +1396,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 = { @@ -1474,7 +1473,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}") @@ -1483,10 +1482,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 = { @@ -1562,7 +1561,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}") @@ -1571,10 +1570,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 = { @@ -1655,7 +1654,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}") @@ -1665,10 +1664,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 = { @@ -1747,7 +1746,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}") @@ -1757,10 +1756,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 = { @@ -1859,7 +1858,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}") @@ -1868,10 +1867,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 = { @@ -1879,7 +1878,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'), @@ -2005,7 +2004,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}") @@ -2014,10 +2013,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: @@ -2042,7 +2041,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", @@ -2175,7 +2174,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}") @@ -2210,7 +2209,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", @@ -2327,7 +2326,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}") @@ -2353,7 +2352,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", @@ -2479,7 +2478,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}") @@ -2488,10 +2487,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: @@ -2516,7 +2515,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", @@ -2646,7 +2645,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}") @@ -2681,7 +2680,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", @@ -2775,7 +2774,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}") @@ -2784,10 +2783,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 = { @@ -2796,7 +2795,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'), @@ -2889,7 +2888,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}") @@ -2898,10 +2897,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 = { @@ -2910,7 +2909,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'), @@ -3003,7 +3002,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}") @@ -3012,10 +3011,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 = { @@ -3024,7 +3023,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'), @@ -3114,7 +3113,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}") @@ -3123,10 +3122,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 = { @@ -3135,7 +3134,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'), @@ -3225,7 +3224,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}") @@ -3234,10 +3233,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 = { @@ -3246,7 +3245,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'), @@ -3332,7 +3331,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}") @@ -3341,10 +3340,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 = { @@ -3352,7 +3351,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'), @@ -3437,7 +3436,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}") @@ -3446,10 +3445,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 = { @@ -3457,7 +3456,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'), @@ -3540,7 +3539,7 @@ def termination_proceed_instance_pool_instance(self, instance_pool_id, terminati "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"termination_proceed_instance_pool_instance got unknown kwargs: {extra_kwargs!r}") @@ -3549,10 +3548,10 @@ def termination_proceed_instance_pool_instance(self, instance_pool_id, terminati "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 = { @@ -3560,7 +3559,7 @@ def termination_proceed_instance_pool_instance(self, instance_pool_id, terminati "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'), @@ -3655,7 +3654,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}") @@ -3664,10 +3663,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 = { @@ -3676,7 +3675,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'), @@ -3768,7 +3767,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}") @@ -3777,10 +3776,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 = { @@ -3789,7 +3788,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'), @@ -3885,7 +3884,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}") @@ -3894,10 +3893,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 = { @@ -3906,7 +3905,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 7c7a62786e..2b3b18d941 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 @@ -165,7 +164,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}") @@ -174,10 +173,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 = { @@ -270,7 +269,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}") @@ -279,10 +278,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 = { @@ -290,7 +289,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'), @@ -389,7 +388,7 @@ def add_ipv4_subnet_cidr(self, subnet_id, add_ipv4_subnet_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_ipv4_subnet_cidr got unknown kwargs: {extra_kwargs!r}") @@ -398,10 +397,10 @@ def add_ipv4_subnet_cidr(self, subnet_id, add_ipv4_subnet_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 = { @@ -411,7 +410,7 @@ def add_ipv4_subnet_cidr(self, subnet_id, add_ipv4_subnet_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'), @@ -510,7 +509,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}") @@ -519,10 +518,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 = { @@ -532,7 +531,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'), @@ -631,7 +630,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}") @@ -640,10 +639,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 = { @@ -653,7 +652,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'), @@ -727,7 +726,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}") @@ -736,10 +735,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 = { @@ -839,7 +838,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}") @@ -848,10 +847,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 = { @@ -860,7 +859,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'), @@ -965,7 +964,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}") @@ -974,10 +973,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 = { @@ -987,7 +986,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'), @@ -1068,7 +1067,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}") @@ -1077,10 +1076,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 = { @@ -1088,7 +1087,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'), @@ -1178,7 +1177,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}") @@ -1187,10 +1186,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 = { @@ -1198,7 +1197,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'), @@ -1276,7 +1275,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}") @@ -1285,10 +1284,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 = { @@ -1372,7 +1371,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}") @@ -1381,10 +1380,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 = { @@ -1492,7 +1491,7 @@ def change_byoasn_compartment(self, byoasn_id, change_byoasn_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_byoasn_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1501,10 +1500,10 @@ def change_byoasn_compartment(self, byoasn_id, change_byoasn_compartment_details "byoasnId": byoasn_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1514,7 +1513,7 @@ def change_byoasn_compartment(self, byoasn_id, change_byoasn_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'), @@ -1611,7 +1610,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}") @@ -1620,10 +1619,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 = { @@ -1632,7 +1631,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'), @@ -1733,7 +1732,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}") @@ -1742,10 +1741,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 = { @@ -1755,7 +1754,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'), @@ -1850,7 +1849,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}") @@ -1859,10 +1858,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 = { @@ -1871,7 +1870,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'), @@ -1968,7 +1967,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}") @@ -1977,10 +1976,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 = { @@ -1989,7 +1988,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'), @@ -2086,7 +2085,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}") @@ -2095,10 +2094,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 = { @@ -2107,7 +2106,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'), @@ -2204,7 +2203,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}") @@ -2213,10 +2212,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 = { @@ -2225,7 +2224,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'), @@ -2320,7 +2319,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}") @@ -2329,10 +2328,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 = { @@ -2341,7 +2340,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'), @@ -2436,7 +2435,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}") @@ -2445,10 +2444,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 = { @@ -2457,7 +2456,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'), @@ -2552,7 +2551,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}") @@ -2561,10 +2560,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 = { @@ -2573,7 +2572,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'), @@ -2670,7 +2669,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}") @@ -2679,10 +2678,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 = { @@ -2691,7 +2690,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'), @@ -2786,7 +2785,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}") @@ -2795,10 +2794,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 = { @@ -2807,7 +2806,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'), @@ -2901,7 +2900,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}") @@ -2910,10 +2909,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 = { @@ -2922,7 +2921,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'), @@ -3020,7 +3019,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}") @@ -3029,10 +3028,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 = { @@ -3041,7 +3040,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'), @@ -3136,7 +3135,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}") @@ -3145,10 +3144,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 = { @@ -3157,7 +3156,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'), @@ -3252,7 +3251,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}") @@ -3261,10 +3260,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 = { @@ -3273,7 +3272,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'), @@ -3370,7 +3369,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}") @@ -3379,10 +3378,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 = { @@ -3391,7 +3390,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'), @@ -3486,7 +3485,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}") @@ -3495,10 +3494,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 = { @@ -3507,7 +3506,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'), @@ -3602,7 +3601,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}") @@ -3611,10 +3610,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 = { @@ -3623,7 +3622,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'), @@ -3718,7 +3717,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}") @@ -3727,10 +3726,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 = { @@ -3739,7 +3738,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'), @@ -3834,7 +3833,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}") @@ -3843,10 +3842,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 = { @@ -3855,7 +3854,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'), @@ -3950,7 +3949,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}") @@ -3959,10 +3958,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 = { @@ -3971,7 +3970,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'), @@ -4074,7 +4073,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}") @@ -4083,10 +4082,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 = { @@ -4096,7 +4095,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'), @@ -4197,7 +4196,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}") @@ -4206,10 +4205,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 = { @@ -4219,7 +4218,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'), @@ -4302,7 +4301,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}") @@ -4311,10 +4310,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 = { @@ -4402,7 +4401,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}") @@ -4411,10 +4410,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 = { @@ -4507,7 +4506,7 @@ def create_byoasn(self, create_byoasn_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_byoasn got unknown kwargs: {extra_kwargs!r}") @@ -4518,7 +4517,7 @@ def create_byoasn(self, create_byoasn_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'), @@ -4606,7 +4605,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}") @@ -4617,7 +4616,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'), @@ -4715,7 +4714,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}") @@ -4726,7 +4725,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'), @@ -4827,7 +4826,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}") @@ -4837,7 +4836,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'), @@ -4943,7 +4942,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}") @@ -4953,7 +4952,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'), @@ -5055,7 +5054,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}") @@ -5065,7 +5064,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'), @@ -5163,7 +5162,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}") @@ -5173,7 +5172,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'), @@ -5270,7 +5269,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}") @@ -5280,7 +5279,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'), @@ -5375,7 +5374,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}") @@ -5385,7 +5384,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'), @@ -5469,7 +5468,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}") @@ -5479,7 +5478,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'), @@ -5561,7 +5560,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}") @@ -5571,7 +5570,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'), @@ -5675,7 +5674,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}") @@ -5685,7 +5684,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'), @@ -5798,7 +5797,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}") @@ -5808,7 +5807,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'), @@ -5896,7 +5895,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}") @@ -5907,7 +5906,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'), @@ -5988,7 +5987,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}") @@ -5998,7 +5997,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'), @@ -6080,7 +6079,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}") @@ -6090,7 +6089,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'), @@ -6171,7 +6170,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}") @@ -6181,7 +6180,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'), @@ -6266,7 +6265,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}") @@ -6276,7 +6275,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'), @@ -6380,7 +6379,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}") @@ -6390,7 +6389,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'), @@ -6476,7 +6475,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}") @@ -6487,7 +6486,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'), @@ -6568,7 +6567,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}") @@ -6578,7 +6577,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'), @@ -6681,7 +6680,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}") @@ -6691,7 +6690,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'), @@ -6791,7 +6790,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}") @@ -6801,7 +6800,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'), @@ -6897,7 +6896,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}") @@ -6907,7 +6906,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'), @@ -7028,7 +7027,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}") @@ -7038,7 +7037,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'), @@ -7160,7 +7159,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}") @@ -7170,7 +7169,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'), @@ -7277,7 +7276,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}") @@ -7287,7 +7286,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'), @@ -7375,7 +7374,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}") @@ -7386,7 +7385,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'), @@ -7484,7 +7483,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}") @@ -7495,7 +7494,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'), @@ -7586,7 +7585,7 @@ def delete_byoasn(self, byoasn_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_byoasn got unknown kwargs: {extra_kwargs!r}") @@ -7595,10 +7594,10 @@ def delete_byoasn(self, byoasn_id, **kwargs): "byoasnId": byoasn_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7607,7 +7606,7 @@ def delete_byoasn(self, byoasn_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'), @@ -7696,7 +7695,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}") @@ -7705,10 +7704,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 = { @@ -7717,7 +7716,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'), @@ -7801,7 +7800,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}") @@ -7810,10 +7809,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 = { @@ -7822,7 +7821,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'), @@ -7902,7 +7901,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}") @@ -7911,10 +7910,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 = { @@ -7922,7 +7921,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'), @@ -8003,7 +8002,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}") @@ -8012,10 +8011,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 = { @@ -8023,7 +8022,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'), @@ -8105,7 +8104,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}") @@ -8114,10 +8113,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 = { @@ -8125,7 +8124,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'), @@ -8209,7 +8208,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}") @@ -8218,10 +8217,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 = { @@ -8229,7 +8228,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'), @@ -8310,7 +8309,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}") @@ -8319,10 +8318,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 = { @@ -8330,7 +8329,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'), @@ -8410,7 +8409,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}") @@ -8419,10 +8418,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 = { @@ -8430,7 +8429,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'), @@ -8510,7 +8509,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}") @@ -8519,10 +8518,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 = { @@ -8530,7 +8529,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'), @@ -8608,7 +8607,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}") @@ -8617,10 +8616,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 = { @@ -8628,7 +8627,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'), @@ -8710,7 +8709,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}") @@ -8719,10 +8718,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 = { @@ -8730,7 +8729,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'), @@ -8815,7 +8814,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}") @@ -8824,10 +8823,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 = { @@ -8835,7 +8834,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'), @@ -8923,7 +8922,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}") @@ -8932,10 +8931,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 = { @@ -8944,7 +8943,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'), @@ -9025,7 +9024,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}") @@ -9034,10 +9033,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 = { @@ -9045,7 +9044,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'), @@ -9127,7 +9126,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}") @@ -9136,10 +9135,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 = { @@ -9147,7 +9146,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'), @@ -9234,7 +9233,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}") @@ -9243,10 +9242,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 = { @@ -9254,7 +9253,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'), @@ -9345,7 +9344,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}") @@ -9354,10 +9353,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 = { @@ -9365,7 +9364,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'), @@ -9459,7 +9458,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}") @@ -9468,10 +9467,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 = { @@ -9479,7 +9478,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'), @@ -9566,7 +9565,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}") @@ -9575,10 +9574,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 = { @@ -9587,7 +9586,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'), @@ -9668,7 +9667,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}") @@ -9677,10 +9676,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 = { @@ -9688,7 +9687,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'), @@ -9772,7 +9771,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}") @@ -9781,10 +9780,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 = { @@ -9792,7 +9791,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'), @@ -9874,7 +9873,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}") @@ -9883,10 +9882,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 = { @@ -9894,7 +9893,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'), @@ -9973,7 +9972,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}") @@ -9982,10 +9981,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 = { @@ -9993,7 +9992,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'), @@ -10073,7 +10072,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}") @@ -10082,10 +10081,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 = { @@ -10093,7 +10092,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'), @@ -10176,7 +10175,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}") @@ -10185,10 +10184,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 = { @@ -10196,7 +10195,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'), @@ -10278,7 +10277,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}") @@ -10287,10 +10286,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 = { @@ -10298,7 +10297,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'), @@ -10383,7 +10382,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}") @@ -10392,10 +10391,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 = { @@ -10404,7 +10403,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'), @@ -10488,7 +10487,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}") @@ -10497,10 +10496,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 = { @@ -10509,7 +10508,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'), @@ -10601,7 +10600,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}") @@ -10610,10 +10609,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 = { @@ -10621,7 +10620,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'), @@ -10730,7 +10729,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}") @@ -10739,10 +10738,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: @@ -10758,14 +10757,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'), @@ -10841,7 +10840,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}") @@ -10851,7 +10850,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'), @@ -10932,7 +10931,7 @@ def get_byoasn(self, byoasn_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_byoasn got unknown kwargs: {extra_kwargs!r}") @@ -10941,10 +10940,10 @@ def get_byoasn(self, byoasn_id, **kwargs): "byoasnId": byoasn_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10952,7 +10951,7 @@ def get_byoasn(self, byoasn_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11035,7 +11034,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}") @@ -11044,10 +11043,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 = { @@ -11055,7 +11054,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'), @@ -11134,7 +11133,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}") @@ -11143,10 +11142,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 = { @@ -11154,7 +11153,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'), @@ -11224,7 +11223,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}") @@ -11233,10 +11232,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 = { @@ -11340,7 +11339,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}") @@ -11349,10 +11348,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 = { @@ -11360,7 +11359,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'), @@ -11449,7 +11448,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}") @@ -11458,10 +11457,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 = { @@ -11469,7 +11468,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'), @@ -11541,7 +11540,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}") @@ -11550,10 +11549,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 = { @@ -11631,7 +11630,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}") @@ -11640,10 +11639,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 = { @@ -11721,7 +11720,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}") @@ -11730,10 +11729,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 = { @@ -11811,7 +11810,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}") @@ -11820,10 +11819,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 = { @@ -11901,7 +11900,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}") @@ -11910,10 +11909,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 = { @@ -11989,7 +11988,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}") @@ -11998,10 +11997,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 = { @@ -12077,7 +12076,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}") @@ -12086,10 +12085,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 = { @@ -12177,7 +12176,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}") @@ -12186,10 +12185,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 = { @@ -12197,7 +12196,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'), @@ -12269,7 +12268,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}") @@ -12278,10 +12277,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 = { @@ -12357,7 +12356,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}") @@ -12366,10 +12365,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 = { @@ -12448,7 +12447,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}") @@ -12457,10 +12456,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 = { @@ -12545,7 +12544,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}") @@ -12555,10 +12554,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 = { @@ -12636,7 +12635,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}") @@ -12645,10 +12644,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 = { @@ -12726,7 +12725,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}") @@ -12735,10 +12734,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 = { @@ -12819,7 +12818,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}") @@ -12828,10 +12827,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 = { @@ -12910,7 +12909,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}") @@ -12919,10 +12918,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 = { @@ -13007,7 +13006,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}") @@ -13017,10 +13016,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 = { @@ -13103,7 +13102,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}") @@ -13113,10 +13112,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 = { @@ -13200,7 +13199,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}") @@ -13210,10 +13209,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 = { @@ -13318,7 +13317,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}") @@ -13327,10 +13326,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 = { @@ -13338,7 +13337,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'), @@ -13425,7 +13424,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}") @@ -13434,10 +13433,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 = { @@ -13445,7 +13444,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'), @@ -13515,7 +13514,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}") @@ -13524,10 +13523,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 = { @@ -13603,7 +13602,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}") @@ -13612,10 +13611,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 = { @@ -13697,7 +13696,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}") @@ -13706,10 +13705,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 = { @@ -13826,7 +13825,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}") @@ -13843,7 +13842,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", @@ -13852,7 +13851,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'), @@ -13928,7 +13927,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}") @@ -13937,10 +13936,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 = { @@ -14030,7 +14029,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}") @@ -14039,10 +14038,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 = { @@ -14122,7 +14121,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}") @@ -14212,7 +14211,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}") @@ -14301,7 +14300,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}") @@ -14310,10 +14309,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 = { @@ -14321,7 +14320,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'), @@ -14391,7 +14390,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}") @@ -14400,10 +14399,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 = { @@ -14488,7 +14487,7 @@ def get_resource_ip_inventory(self, data_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_resource_ip_inventory got unknown kwargs: {extra_kwargs!r}") @@ -14497,10 +14496,10 @@ def get_resource_ip_inventory(self, data_request_id, **kwargs): "dataRequestId": data_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14508,7 +14507,7 @@ def get_resource_ip_inventory(self, data_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'), @@ -14578,7 +14577,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}") @@ -14587,10 +14586,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 = { @@ -14666,7 +14665,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}") @@ -14675,10 +14674,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 = { @@ -14754,7 +14753,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}") @@ -14763,10 +14762,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 = { @@ -14842,7 +14841,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}") @@ -14851,10 +14850,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 = { @@ -14930,7 +14929,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}") @@ -14939,10 +14938,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 = { @@ -15029,7 +15028,7 @@ def get_subnet_cidr_utilization(self, 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_subnet_cidr_utilization got unknown kwargs: {extra_kwargs!r}") @@ -15038,10 +15037,10 @@ def get_subnet_cidr_utilization(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 = { @@ -15049,7 +15048,7 @@ def get_subnet_cidr_utilization(self, 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'), @@ -15130,7 +15129,7 @@ def get_subnet_ip_inventory(self, 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_subnet_ip_inventory got unknown kwargs: {extra_kwargs!r}") @@ -15139,10 +15138,10 @@ def get_subnet_ip_inventory(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 = { @@ -15150,7 +15149,7 @@ def get_subnet_ip_inventory(self, 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'), @@ -15266,7 +15265,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}") @@ -15284,7 +15283,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", @@ -15293,7 +15292,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'), @@ -15381,7 +15380,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}") @@ -15391,10 +15390,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 = { @@ -15402,7 +15401,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'), @@ -15505,7 +15504,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}") @@ -15515,10 +15514,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 = { @@ -15526,7 +15525,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'), @@ -15607,7 +15606,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}") @@ -15616,10 +15615,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 = { @@ -15627,7 +15626,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'), @@ -15697,7 +15696,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}") @@ -15706,10 +15705,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 = { @@ -15794,7 +15793,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}") @@ -15803,10 +15802,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 = { @@ -15814,7 +15813,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'), @@ -15906,7 +15905,7 @@ def get_vcn_overlap(self, vcn_id, get_vcn_overlap_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"get_vcn_overlap got unknown kwargs: {extra_kwargs!r}") @@ -15915,10 +15914,10 @@ def get_vcn_overlap(self, vcn_id, get_vcn_overlap_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 = { @@ -15927,7 +15926,7 @@ def get_vcn_overlap(self, vcn_id, get_vcn_overlap_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'), @@ -16046,7 +16045,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}") @@ -16064,7 +16063,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", @@ -16073,7 +16072,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'), @@ -16143,7 +16142,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}") @@ -16152,10 +16151,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 = { @@ -16242,7 +16241,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}") @@ -16251,10 +16250,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 = { @@ -16262,7 +16261,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'), @@ -16337,7 +16336,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}") @@ -16346,10 +16345,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 = { @@ -16434,7 +16433,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}") @@ -16443,10 +16442,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 = { @@ -16454,7 +16453,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'), @@ -16549,7 +16548,7 @@ def ipv6_vnic_detach(self, ipv6_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"ipv6_vnic_detach got unknown kwargs: {extra_kwargs!r}") @@ -16558,10 +16557,10 @@ def ipv6_vnic_detach(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 = { @@ -16571,7 +16570,7 @@ def ipv6_vnic_detach(self, ipv6_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'), @@ -16640,7 +16639,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}") @@ -16767,7 +16766,7 @@ def list_byoasns(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_byoasns got unknown kwargs: {extra_kwargs!r}") @@ -16795,14 +16794,14 @@ def list_byoasns(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'), @@ -16902,7 +16901,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}") @@ -16911,24 +16910,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'), @@ -17056,7 +17055,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}") @@ -17084,14 +17083,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'), @@ -17225,7 +17224,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}") @@ -17268,14 +17267,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'), @@ -17381,7 +17380,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}") @@ -17390,14 +17389,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'), @@ -17491,7 +17490,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}") @@ -17501,7 +17500,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", @@ -17631,7 +17630,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}") @@ -17666,7 +17665,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", @@ -17766,7 +17765,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}") @@ -17776,7 +17775,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", @@ -17863,7 +17862,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}") @@ -17872,10 +17871,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 = { @@ -17883,7 +17882,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'), @@ -18017,7 +18016,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}") @@ -18053,7 +18052,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", @@ -18154,7 +18153,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}") @@ -18164,7 +18163,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", @@ -18303,7 +18302,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}") @@ -18339,7 +18338,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", @@ -18502,7 +18501,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}") @@ -18549,7 +18548,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", @@ -18659,7 +18658,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}") @@ -18668,10 +18667,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: @@ -18694,7 +18693,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", @@ -18827,7 +18826,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}") @@ -18862,7 +18861,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", @@ -18966,7 +18965,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}") @@ -18975,10 +18974,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: @@ -18993,7 +18992,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", @@ -19131,7 +19130,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}") @@ -19167,7 +19166,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", @@ -19264,7 +19263,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}") @@ -19274,7 +19273,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", @@ -19380,7 +19379,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}") @@ -19390,7 +19389,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", @@ -19494,7 +19493,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}") @@ -19503,17 +19502,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", @@ -19652,7 +19651,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}") @@ -19688,7 +19687,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", @@ -19770,7 +19769,7 @@ def list_ip_inventory(self, list_ip_inventory_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"list_ip_inventory got unknown kwargs: {extra_kwargs!r}") @@ -19780,7 +19779,7 @@ def list_ip_inventory(self, list_ip_inventory_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'), @@ -19885,7 +19884,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}") @@ -19895,10 +19894,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: @@ -19913,7 +19912,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", @@ -20019,7 +20018,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}") @@ -20029,17 +20028,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", @@ -20140,7 +20139,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}") @@ -20149,17 +20148,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", @@ -20273,7 +20272,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}") @@ -20285,7 +20284,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", @@ -20422,7 +20421,7 @@ def list_ipv6s(self, **kwargs): "lifetime", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -20436,14 +20435,14 @@ def list_ipv6s(self, **kwargs): "ipState": kwargs.get("ip_state", missing), "lifetime": kwargs.get("lifetime", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20542,7 +20541,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}") @@ -20553,7 +20552,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", @@ -20688,7 +20687,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}") @@ -20724,7 +20723,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", @@ -20841,7 +20840,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}") @@ -20850,10 +20849,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: @@ -20884,7 +20883,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", @@ -20996,7 +20995,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}") @@ -21005,10 +21004,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: @@ -21031,7 +21030,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", @@ -21175,7 +21174,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}") @@ -21212,7 +21211,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", @@ -21357,7 +21356,7 @@ def list_private_ips(self, **kwargs): "lifetime", "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}") @@ -21372,7 +21371,7 @@ def list_private_ips(self, **kwargs): "lifetime": kwargs.get("lifetime", 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", @@ -21503,7 +21502,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}") @@ -21531,14 +21530,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'), @@ -21679,7 +21678,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}") @@ -21706,7 +21705,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", @@ -21810,7 +21809,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}") @@ -21821,7 +21820,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", @@ -21960,7 +21959,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}") @@ -21996,7 +21995,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", @@ -22131,7 +22130,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}") @@ -22167,7 +22166,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", @@ -22298,7 +22297,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}") @@ -22333,7 +22332,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", @@ -22426,7 +22425,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}") @@ -22435,7 +22434,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", @@ -22570,7 +22569,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}") @@ -22606,7 +22605,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", @@ -22734,7 +22733,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}") @@ -22769,7 +22768,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", @@ -22866,7 +22865,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}") @@ -22875,17 +22874,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", @@ -22988,7 +22987,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}") @@ -22998,7 +22997,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", @@ -23089,7 +23088,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}") @@ -23098,10 +23097,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: @@ -23114,7 +23113,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", @@ -23246,7 +23245,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}") @@ -23281,7 +23280,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", @@ -23422,7 +23421,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}") @@ -23458,14 +23457,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'), @@ -23622,7 +23621,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}") @@ -23662,14 +23661,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'), @@ -23771,7 +23770,7 @@ def modify_ipv4_subnet_cidr(self, subnet_id, modify_ipv4_subnet_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"modify_ipv4_subnet_cidr got unknown kwargs: {extra_kwargs!r}") @@ -23780,10 +23779,10 @@ def modify_ipv4_subnet_cidr(self, subnet_id, modify_ipv4_subnet_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 = { @@ -23793,7 +23792,7 @@ def modify_ipv4_subnet_cidr(self, subnet_id, modify_ipv4_subnet_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'), @@ -23900,7 +23899,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}") @@ -23909,10 +23908,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 = { @@ -23922,7 +23921,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'), @@ -24018,7 +24017,7 @@ def private_ip_vnic_detach(self, private_ip_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"private_ip_vnic_detach got unknown kwargs: {extra_kwargs!r}") @@ -24027,10 +24026,10 @@ def private_ip_vnic_detach(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 = { @@ -24040,7 +24039,7 @@ def private_ip_vnic_detach(self, private_ip_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'), @@ -24114,7 +24113,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}") @@ -24123,10 +24122,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 = { @@ -24205,7 +24204,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}") @@ -24214,10 +24213,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 = { @@ -24308,7 +24307,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}") @@ -24317,10 +24316,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 = { @@ -24329,7 +24328,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'), @@ -24415,7 +24414,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}") @@ -24424,10 +24423,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 = { @@ -24436,7 +24435,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'), @@ -24532,7 +24531,7 @@ def remove_ipv4_subnet_cidr(self, subnet_id, remove_ipv4_subnet_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_ipv4_subnet_cidr got unknown kwargs: {extra_kwargs!r}") @@ -24541,10 +24540,10 @@ def remove_ipv4_subnet_cidr(self, subnet_id, remove_ipv4_subnet_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 = { @@ -24554,7 +24553,7 @@ def remove_ipv4_subnet_cidr(self, subnet_id, remove_ipv4_subnet_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'), @@ -24653,7 +24652,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}") @@ -24662,10 +24661,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 = { @@ -24675,7 +24674,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'), @@ -24773,7 +24772,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}") @@ -24782,10 +24781,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 = { @@ -24795,7 +24794,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'), @@ -24870,7 +24869,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}") @@ -24879,10 +24878,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 = { @@ -24978,7 +24977,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}") @@ -24987,10 +24986,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 = { @@ -24999,7 +24998,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'), @@ -25102,7 +25101,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}") @@ -25111,10 +25110,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 = { @@ -25124,7 +25123,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'), @@ -25221,7 +25220,7 @@ def set_origin_asn(self, byoip_range_id, set_origin_asn_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"set_origin_asn got unknown kwargs: {extra_kwargs!r}") @@ -25230,10 +25229,10 @@ def set_origin_asn(self, byoip_range_id, set_origin_asn_details, **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 = { @@ -25243,7 +25242,7 @@ def set_origin_asn(self, byoip_range_id, set_origin_asn_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'), @@ -25331,7 +25330,7 @@ def set_origin_asn_to_oracle(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"set_origin_asn_to_oracle got unknown kwargs: {extra_kwargs!r}") @@ -25340,10 +25339,10 @@ def set_origin_asn_to_oracle(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 = { @@ -25352,7 +25351,7 @@ def set_origin_asn_to_oracle(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'), @@ -25438,7 +25437,7 @@ def update_byoasn(self, byoasn_id, update_byoasn_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_byoasn got unknown kwargs: {extra_kwargs!r}") @@ -25447,10 +25446,10 @@ def update_byoasn(self, byoasn_id, update_byoasn_details, **kwargs): "byoasnId": byoasn_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -25459,7 +25458,7 @@ def update_byoasn(self, byoasn_id, update_byoasn_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'), @@ -25549,7 +25548,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}") @@ -25558,10 +25557,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 = { @@ -25570,7 +25569,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'), @@ -25660,7 +25659,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}") @@ -25669,10 +25668,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 = { @@ -25681,7 +25680,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'), @@ -25767,7 +25766,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}") @@ -25776,10 +25775,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 = { @@ -25787,7 +25786,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'), @@ -25874,7 +25873,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}") @@ -25883,10 +25882,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 = { @@ -25894,7 +25893,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'), @@ -25982,7 +25981,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}") @@ -25991,10 +25990,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 = { @@ -26002,7 +26001,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'), @@ -26092,7 +26091,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}") @@ -26101,10 +26100,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 = { @@ -26112,7 +26111,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'), @@ -26197,7 +26196,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}") @@ -26206,10 +26205,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 = { @@ -26217,7 +26216,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'), @@ -26303,7 +26302,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}") @@ -26312,10 +26311,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 = { @@ -26323,7 +26322,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'), @@ -26408,7 +26407,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}") @@ -26417,10 +26416,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 = { @@ -26428,7 +26427,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'), @@ -26503,7 +26502,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}") @@ -26512,10 +26511,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 = { @@ -26596,7 +26595,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}") @@ -26605,10 +26604,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 = { @@ -26699,7 +26698,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}") @@ -26708,10 +26707,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 = { @@ -26719,7 +26718,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'), @@ -26808,7 +26807,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}") @@ -26817,10 +26816,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 = { @@ -26828,7 +26827,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'), @@ -26916,7 +26915,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}") @@ -26925,10 +26924,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 = { @@ -26936,7 +26935,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'), @@ -27044,7 +27043,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}") @@ -27054,10 +27053,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 = { @@ -27066,7 +27065,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'), @@ -27160,7 +27159,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}") @@ -27170,10 +27169,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 = { @@ -27181,7 +27180,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'), @@ -27281,7 +27280,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}") @@ -27290,10 +27289,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 = { @@ -27302,7 +27301,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'), @@ -27387,7 +27386,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}") @@ -27396,10 +27395,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 = { @@ -27407,7 +27406,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'), @@ -27492,7 +27491,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}") @@ -27501,10 +27500,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 = { @@ -27512,7 +27511,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'), @@ -27613,7 +27612,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}") @@ -27622,10 +27621,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 = { @@ -27633,7 +27632,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'), @@ -27709,7 +27708,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}") @@ -27718,10 +27717,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 = { @@ -27823,7 +27822,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}") @@ -27832,10 +27831,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 = { @@ -27843,7 +27842,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'), @@ -27969,7 +27968,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}") @@ -27978,10 +27977,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 = { @@ -27989,7 +27988,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'), @@ -28079,7 +28078,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}") @@ -28088,10 +28087,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 = { @@ -28100,7 +28099,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'), @@ -28185,7 +28184,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}") @@ -28194,10 +28193,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 = { @@ -28205,7 +28204,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'), @@ -28295,7 +28294,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}") @@ -28304,10 +28303,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 = { @@ -28315,7 +28314,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'), @@ -28404,7 +28403,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}") @@ -28413,10 +28412,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 = { @@ -28424,7 +28423,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'), @@ -28510,7 +28509,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}") @@ -28519,10 +28518,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 = { @@ -28530,7 +28529,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'), @@ -28615,7 +28614,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}") @@ -28624,10 +28623,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 = { @@ -28635,7 +28634,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'), @@ -28740,7 +28739,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}") @@ -28750,10 +28749,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 = { @@ -28763,7 +28762,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'), @@ -28851,7 +28850,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}") @@ -28860,10 +28859,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 = { @@ -28871,7 +28870,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'), @@ -28981,7 +28980,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}") @@ -28990,10 +28989,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 = { @@ -29001,7 +29000,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'), @@ -29094,7 +29093,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}") @@ -29103,10 +29102,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 = { @@ -29115,7 +29114,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'), @@ -29200,7 +29199,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}") @@ -29209,10 +29208,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 = { @@ -29220,7 +29219,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'), @@ -29310,7 +29309,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}") @@ -29319,10 +29318,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 = { @@ -29331,7 +29330,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'), @@ -29421,7 +29420,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}") @@ -29430,10 +29429,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 = { @@ -29442,7 +29441,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'), @@ -29537,7 +29536,7 @@ def validate_byoasn(self, byoasn_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_byoasn got unknown kwargs: {extra_kwargs!r}") @@ -29546,10 +29545,10 @@ def validate_byoasn(self, byoasn_id, **kwargs): "byoasnId": byoasn_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -29559,7 +29558,7 @@ def validate_byoasn(self, byoasn_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'), @@ -29642,7 +29641,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}") @@ -29651,10 +29650,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 = { @@ -29662,7 +29661,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'), @@ -29739,7 +29738,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}") @@ -29748,10 +29747,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 = { @@ -29759,7 +29758,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 34eee5e5ed..996e71a3f2 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 @@ -180,7 +179,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}") @@ -189,10 +188,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 = { @@ -201,7 +200,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'), @@ -298,7 +297,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}") @@ -310,7 +309,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'), @@ -405,7 +404,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}") @@ -414,10 +413,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 = { @@ -427,7 +426,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'), @@ -511,7 +510,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}") @@ -520,10 +519,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 = { @@ -532,7 +531,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'), @@ -659,7 +658,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}") @@ -695,7 +694,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", @@ -703,7 +702,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'), @@ -802,7 +801,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}") @@ -811,10 +810,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 = { @@ -824,7 +823,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 3295f03f57..ece690b78f 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 @@ -180,7 +179,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}") @@ -189,10 +188,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 = { @@ -201,7 +200,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'), @@ -298,7 +297,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}") @@ -310,7 +309,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'), @@ -405,7 +404,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}") @@ -414,10 +413,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 = { @@ -427,7 +426,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'), @@ -511,7 +510,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}") @@ -520,10 +519,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 = { @@ -532,7 +531,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'), @@ -659,7 +658,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}") @@ -695,7 +694,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", @@ -703,7 +702,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'), @@ -802,7 +801,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}") @@ -811,10 +810,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 = { @@ -824,7 +823,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 a730e7594d..b1d0dfcfd5 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 @@ -171,7 +170,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}") @@ -180,10 +179,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 = { @@ -192,7 +191,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'), @@ -280,7 +279,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}") @@ -289,10 +288,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 = { @@ -301,7 +300,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'), @@ -401,7 +400,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}") @@ -411,10 +410,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 = { @@ -424,7 +423,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'), @@ -513,7 +512,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}") @@ -522,10 +521,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 = { @@ -534,7 +533,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'), @@ -634,7 +633,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}") @@ -644,10 +643,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 = { @@ -657,7 +656,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'), @@ -755,7 +754,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}") @@ -765,10 +764,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"] @@ -781,7 +780,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", @@ -789,7 +788,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'), @@ -884,7 +883,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}") @@ -894,10 +893,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 = { @@ -906,7 +905,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'), @@ -1008,7 +1007,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}") @@ -1017,16 +1016,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", @@ -1035,7 +1034,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'), @@ -1129,7 +1128,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}") @@ -1138,16 +1137,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", @@ -1155,7 +1154,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'), @@ -1248,7 +1247,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}") @@ -1257,16 +1256,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", @@ -1274,7 +1273,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'), @@ -1367,7 +1366,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}") @@ -1376,16 +1375,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", @@ -1393,7 +1392,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'), @@ -1488,7 +1487,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}") @@ -1499,10 +1498,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 = { @@ -1511,7 +1510,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'), @@ -1610,7 +1609,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}") @@ -1622,10 +1621,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 = { @@ -1634,7 +1633,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'), @@ -1722,7 +1721,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}") @@ -1733,7 +1732,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'), @@ -1816,7 +1815,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}") @@ -1827,7 +1826,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'), @@ -1916,7 +1915,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}") @@ -1926,10 +1925,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 = { @@ -1938,7 +1937,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'), @@ -2031,7 +2030,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}") @@ -2041,10 +2040,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 = { @@ -2053,7 +2052,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'), @@ -2143,7 +2142,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}") @@ -2152,10 +2151,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 = { @@ -2164,7 +2163,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'), @@ -2257,7 +2256,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}") @@ -2267,10 +2266,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 = { @@ -2279,7 +2278,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'), @@ -2372,7 +2371,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}") @@ -2382,10 +2381,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 = { @@ -2394,7 +2393,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'), @@ -2490,7 +2489,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}") @@ -2501,10 +2500,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 = { @@ -2513,7 +2512,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'), @@ -2606,7 +2605,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}") @@ -2616,10 +2615,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 = { @@ -2628,7 +2627,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'), @@ -2724,7 +2723,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}") @@ -2735,10 +2734,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 = { @@ -2747,7 +2746,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'), @@ -2837,7 +2836,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}") @@ -2846,10 +2845,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 = { @@ -2858,7 +2857,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'), @@ -2948,7 +2947,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}") @@ -2957,10 +2956,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 = { @@ -2969,7 +2968,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'), @@ -3059,7 +3058,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}") @@ -3068,10 +3067,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 = { @@ -3080,7 +3079,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'), @@ -3173,7 +3172,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}") @@ -3183,10 +3182,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 = { @@ -3195,7 +3194,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'), @@ -3282,7 +3281,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}") @@ -3293,7 +3292,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'), @@ -3379,7 +3378,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}") @@ -3388,10 +3387,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 = { @@ -3400,7 +3399,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'), @@ -3490,7 +3489,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}") @@ -3499,10 +3498,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 = { @@ -3511,7 +3510,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'), @@ -3604,7 +3603,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}") @@ -3614,10 +3613,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 = { @@ -3626,7 +3625,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'), @@ -3722,7 +3721,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}") @@ -3733,10 +3732,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 = { @@ -3745,7 +3744,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'), @@ -3841,7 +3840,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}") @@ -3853,10 +3852,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 = { @@ -3865,7 +3864,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'), @@ -3959,7 +3958,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}") @@ -3972,10 +3971,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 = { @@ -3984,7 +3983,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'), @@ -4070,7 +4069,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}") @@ -4079,16 +4078,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", @@ -4096,7 +4095,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'), @@ -4184,7 +4183,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}") @@ -4193,16 +4192,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", @@ -4210,7 +4209,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'), @@ -4300,7 +4299,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}") @@ -4311,10 +4310,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 = { @@ -4323,7 +4322,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'), @@ -4411,7 +4410,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}") @@ -4422,10 +4421,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 = { @@ -4434,7 +4433,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'), @@ -4519,7 +4518,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}") @@ -4529,10 +4528,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 = { @@ -4541,7 +4540,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'), @@ -4629,7 +4628,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}") @@ -4640,10 +4639,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 = { @@ -4652,7 +4651,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'), @@ -4740,7 +4739,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}") @@ -4751,10 +4750,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 = { @@ -4763,7 +4762,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'), @@ -4854,7 +4853,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}") @@ -4866,10 +4865,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 = { @@ -4878,7 +4877,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'), @@ -4966,7 +4965,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}") @@ -4977,10 +4976,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 = { @@ -4989,7 +4988,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'), @@ -5080,7 +5079,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}") @@ -5092,10 +5091,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 = { @@ -5104,7 +5103,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'), @@ -5189,7 +5188,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}") @@ -5199,10 +5198,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 = { @@ -5211,7 +5210,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'), @@ -5296,7 +5295,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}") @@ -5306,10 +5305,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 = { @@ -5318,7 +5317,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'), @@ -5403,7 +5402,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}") @@ -5413,10 +5412,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 = { @@ -5425,7 +5424,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'), @@ -5511,7 +5510,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}") @@ -5520,16 +5519,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", @@ -5537,7 +5536,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'), @@ -5624,7 +5623,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}") @@ -5634,10 +5633,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 = { @@ -5646,7 +5645,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'), @@ -5731,7 +5730,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}") @@ -5741,10 +5740,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 = { @@ -5753,7 +5752,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'), @@ -5841,7 +5840,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}") @@ -5852,10 +5851,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 = { @@ -5864,7 +5863,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'), @@ -5955,7 +5954,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}") @@ -5967,10 +5966,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 = { @@ -5979,7 +5978,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'), @@ -6068,7 +6067,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}") @@ -6077,16 +6076,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", @@ -6094,7 +6093,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'), @@ -6194,7 +6193,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}") @@ -6204,10 +6203,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 = { @@ -6217,7 +6216,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'), @@ -6307,7 +6306,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}") @@ -6317,10 +6316,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 = { @@ -6329,7 +6328,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'), @@ -6423,7 +6422,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}") @@ -6433,16 +6432,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", @@ -6450,7 +6449,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'), @@ -6554,7 +6553,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}") @@ -6565,17 +6564,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", @@ -6583,7 +6582,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'), @@ -6684,7 +6683,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}") @@ -6696,10 +6695,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: @@ -6714,14 +6713,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'), @@ -6819,7 +6818,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}") @@ -6832,10 +6831,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: @@ -6849,14 +6848,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'), @@ -6936,7 +6935,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}") @@ -6945,10 +6944,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 = { @@ -6956,7 +6955,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'), @@ -7034,7 +7033,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}") @@ -7043,10 +7042,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 = { @@ -7054,7 +7053,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'), @@ -7144,7 +7143,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}") @@ -7155,10 +7154,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: @@ -7172,14 +7171,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'), @@ -7271,7 +7270,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}") @@ -7282,10 +7281,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: @@ -7299,14 +7298,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'), @@ -7395,7 +7394,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}") @@ -7405,10 +7404,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: @@ -7422,14 +7421,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'), @@ -7521,7 +7520,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}") @@ -7532,10 +7531,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: @@ -7549,14 +7548,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'), @@ -7652,7 +7651,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}") @@ -7663,10 +7662,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: @@ -7681,14 +7680,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'), @@ -7783,7 +7782,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}") @@ -7795,10 +7794,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: @@ -7812,14 +7811,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'), @@ -7915,7 +7914,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}") @@ -7926,10 +7925,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: @@ -7944,14 +7943,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'), @@ -8046,7 +8045,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}") @@ -8058,10 +8057,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: @@ -8075,14 +8074,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'), @@ -8171,7 +8170,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}") @@ -8181,10 +8180,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: @@ -8198,14 +8197,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'), @@ -8294,7 +8293,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}") @@ -8304,10 +8303,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: @@ -8321,14 +8320,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'), @@ -8417,7 +8416,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}") @@ -8427,10 +8426,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: @@ -8444,14 +8443,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'), @@ -8543,7 +8542,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}") @@ -8554,10 +8553,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: @@ -8571,14 +8570,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'), @@ -8673,7 +8672,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}") @@ -8685,10 +8684,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: @@ -8702,14 +8701,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'), @@ -8804,7 +8803,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}") @@ -8816,10 +8815,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: @@ -8833,14 +8832,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'), @@ -8920,7 +8919,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}") @@ -8929,10 +8928,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 = { @@ -8940,7 +8939,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'), @@ -9027,7 +9026,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}") @@ -9037,10 +9036,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: @@ -9054,14 +9053,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'), @@ -9150,7 +9149,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}") @@ -9160,10 +9159,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: @@ -9177,14 +9176,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'), @@ -9276,7 +9275,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}") @@ -9287,10 +9286,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: @@ -9304,14 +9303,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'), @@ -9406,7 +9405,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}") @@ -9418,10 +9417,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: @@ -9435,14 +9434,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'), @@ -9531,7 +9530,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}") @@ -9541,10 +9540,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: @@ -9558,14 +9557,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'), @@ -9645,7 +9644,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}") @@ -9654,10 +9653,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 = { @@ -9665,7 +9664,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'), @@ -9765,7 +9764,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}") @@ -9775,10 +9774,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 = { @@ -9788,7 +9787,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'), @@ -9890,7 +9889,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}") @@ -9900,10 +9899,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"] @@ -9917,7 +9916,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", @@ -9925,7 +9924,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'), @@ -10024,7 +10023,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}") @@ -10034,16 +10033,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", @@ -10051,7 +10050,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'), @@ -10144,7 +10143,7 @@ def import_lineage(self, catalog_id, data_asset_key, import_lineage_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"import_lineage got unknown kwargs: {extra_kwargs!r}") @@ -10154,10 +10153,10 @@ def import_lineage(self, catalog_id, data_asset_key, import_lineage_details, **k "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 = { @@ -10166,7 +10165,7 @@ def import_lineage(self, catalog_id, data_asset_key, import_lineage_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'), @@ -10289,7 +10288,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}") @@ -10300,10 +10299,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: @@ -10337,14 +10336,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'), @@ -10487,7 +10486,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}") @@ -10499,10 +10498,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: @@ -10547,14 +10546,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'), @@ -10749,7 +10748,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}") @@ -10760,10 +10759,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: @@ -10820,14 +10819,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'), @@ -10937,7 +10936,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}") @@ -10972,14 +10971,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'), @@ -11087,7 +11086,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}") @@ -11122,14 +11121,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'), @@ -11286,7 +11285,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}") @@ -11296,10 +11295,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: @@ -11348,14 +11347,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'), @@ -11512,7 +11511,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}") @@ -11522,10 +11521,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: @@ -11589,14 +11588,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'), @@ -11733,7 +11732,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}") @@ -11743,10 +11742,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: @@ -11791,14 +11790,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'), @@ -11948,7 +11947,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}") @@ -11957,10 +11956,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: @@ -12008,14 +12007,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'), @@ -12140,7 +12139,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}") @@ -12150,10 +12149,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: @@ -12177,7 +12176,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", @@ -12186,7 +12185,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'), @@ -12395,7 +12394,7 @@ def list_entities(self, catalog_id, data_asset_key, **kwargs): "opc_request_id", "is_process" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -12405,10 +12404,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: @@ -12475,14 +12474,14 @@ def list_entities(self, catalog_id, data_asset_key, **kwargs): "page": kwargs.get("page", missing), "isProcess": kwargs.get("is_process", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12622,7 +12621,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}") @@ -12633,10 +12632,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: @@ -12681,14 +12680,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'), @@ -12828,7 +12827,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}") @@ -12839,10 +12838,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: @@ -12887,14 +12886,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'), @@ -13076,7 +13075,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}") @@ -13086,10 +13085,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: @@ -13150,14 +13149,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'), @@ -13299,7 +13298,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}") @@ -13308,10 +13307,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: @@ -13357,14 +13356,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'), @@ -13538,7 +13537,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}") @@ -13547,10 +13546,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: @@ -13617,14 +13616,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'), @@ -13811,7 +13810,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}") @@ -13821,10 +13820,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: @@ -13886,14 +13885,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'), @@ -14035,7 +14034,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}") @@ -14046,10 +14045,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: @@ -14094,14 +14093,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'), @@ -14270,7 +14269,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}") @@ -14281,10 +14280,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: @@ -14328,14 +14327,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'), @@ -14534,7 +14533,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}") @@ -14543,10 +14542,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: @@ -14617,14 +14616,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'), @@ -14734,7 +14733,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}") @@ -14769,14 +14768,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'), @@ -14916,7 +14915,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}") @@ -14925,10 +14924,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: @@ -14974,14 +14973,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'), @@ -15123,7 +15122,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}") @@ -15132,10 +15131,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: @@ -15181,14 +15180,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'), @@ -15352,7 +15351,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}") @@ -15363,10 +15362,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: @@ -15429,14 +15428,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'), @@ -15558,7 +15557,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}") @@ -15567,10 +15566,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: @@ -15612,14 +15611,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'), @@ -15747,7 +15746,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}") @@ -15758,10 +15757,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: @@ -15803,14 +15802,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'), @@ -15953,7 +15952,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}") @@ -15963,10 +15962,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: @@ -16019,14 +16018,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'), @@ -16162,7 +16161,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}") @@ -16171,10 +16170,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: @@ -16220,14 +16219,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'), @@ -16327,7 +16326,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}") @@ -16336,10 +16335,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: @@ -16362,14 +16361,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'), @@ -16469,7 +16468,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}") @@ -16478,10 +16477,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: @@ -16504,14 +16503,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'), @@ -16599,7 +16598,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}") @@ -16609,14 +16608,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'), @@ -16714,7 +16713,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}") @@ -16723,10 +16722,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: @@ -16749,14 +16748,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'), @@ -16854,7 +16853,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}") @@ -16864,16 +16863,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", @@ -16881,7 +16880,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'), @@ -16974,7 +16973,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}") @@ -16983,10 +16982,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 = { @@ -16995,7 +16994,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'), @@ -17094,7 +17093,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}") @@ -17103,10 +17102,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"] @@ -17135,14 +17134,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'), @@ -17230,7 +17229,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}") @@ -17239,10 +17238,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 = { @@ -17251,7 +17250,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'), @@ -17339,7 +17338,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}") @@ -17348,10 +17347,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 = { @@ -17360,7 +17359,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'), @@ -17460,7 +17459,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}") @@ -17470,10 +17469,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 = { @@ -17483,7 +17482,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'), @@ -17572,7 +17571,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}") @@ -17581,10 +17580,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 = { @@ -17593,7 +17592,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'), @@ -17715,7 +17714,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}") @@ -17724,10 +17723,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: @@ -17761,14 +17760,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'), @@ -17863,7 +17862,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}") @@ -17872,10 +17871,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 = { @@ -17883,14 +17882,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'), @@ -17989,7 +17988,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}") @@ -17999,10 +17998,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"] @@ -18015,7 +18014,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", @@ -18023,7 +18022,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'), @@ -18118,7 +18117,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}") @@ -18129,10 +18128,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 = { @@ -18141,7 +18140,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'), @@ -18240,7 +18239,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}") @@ -18252,10 +18251,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 = { @@ -18264,7 +18263,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'), @@ -18357,7 +18356,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}") @@ -18366,16 +18365,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", @@ -18383,7 +18382,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'), @@ -18478,7 +18477,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}") @@ -18487,16 +18486,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", @@ -18504,7 +18503,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'), @@ -18599,7 +18598,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}") @@ -18610,10 +18609,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 = { @@ -18622,7 +18621,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'), @@ -18717,7 +18716,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}") @@ -18728,10 +18727,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 = { @@ -18740,7 +18739,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'), @@ -18832,7 +18831,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}") @@ -18842,10 +18841,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 = { @@ -18854,7 +18853,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'), @@ -18949,7 +18948,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}") @@ -18960,10 +18959,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 = { @@ -18972,7 +18971,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'), @@ -19067,7 +19066,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}") @@ -19078,10 +19077,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 = { @@ -19090,7 +19089,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'), @@ -19182,7 +19181,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}") @@ -19192,10 +19191,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 = { @@ -19204,7 +19203,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'), @@ -19296,7 +19295,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}") @@ -19306,10 +19305,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 = { @@ -19318,7 +19317,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'), @@ -19410,7 +19409,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}") @@ -19420,10 +19419,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 = { @@ -19432,7 +19431,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'), @@ -19525,7 +19524,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}") @@ -19534,16 +19533,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", @@ -19551,7 +19550,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'), @@ -19645,7 +19644,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}") @@ -19655,10 +19654,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 = { @@ -19667,7 +19666,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'), @@ -19759,7 +19758,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}") @@ -19769,10 +19768,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 = { @@ -19781,7 +19780,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'), @@ -19876,7 +19875,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}") @@ -19887,10 +19886,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 = { @@ -19899,7 +19898,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'), @@ -19997,7 +19996,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}") @@ -20009,10 +20008,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 = { @@ -20021,7 +20020,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'), @@ -20124,7 +20123,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}") @@ -20135,10 +20134,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 = { @@ -20148,7 +20147,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'), @@ -20247,7 +20246,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}") @@ -20256,10 +20255,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: @@ -20282,14 +20281,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'), @@ -20383,7 +20382,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}") @@ -20393,10 +20392,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 = { @@ -20405,7 +20404,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'), @@ -20500,7 +20499,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}") @@ -20510,10 +20509,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 = { @@ -20522,7 +20521,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 990babc758..a8aa131f61 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 @@ -167,7 +166,7 @@ def cascading_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"cascading_delete_application got unknown kwargs: {extra_kwargs!r}") @@ -176,10 +175,10 @@ def cascading_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 = { @@ -188,7 +187,7 @@ def cascading_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'), @@ -280,7 +279,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}") @@ -289,10 +288,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 = { @@ -302,7 +301,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'), @@ -399,7 +398,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}") @@ -408,10 +407,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 = { @@ -421,7 +420,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'), @@ -510,7 +509,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}") @@ -519,10 +518,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 = { @@ -531,7 +530,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'), @@ -627,7 +626,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}") @@ -636,10 +635,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 = { @@ -649,7 +648,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'), @@ -743,7 +742,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}") @@ -752,10 +751,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 = { @@ -765,7 +764,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'), @@ -850,7 +849,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}") @@ -861,7 +860,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'), @@ -946,7 +945,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}") @@ -957,7 +956,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'), @@ -1044,7 +1043,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}") @@ -1055,7 +1054,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'), @@ -1145,7 +1144,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}") @@ -1157,7 +1156,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'), @@ -1242,7 +1241,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}") @@ -1253,7 +1252,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'), @@ -1334,7 +1333,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}") @@ -1343,10 +1342,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 = { @@ -1354,7 +1353,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'), @@ -1439,7 +1438,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}") @@ -1448,10 +1447,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 = { @@ -1460,7 +1459,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'), @@ -1541,7 +1540,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}") @@ -1550,10 +1549,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 = { @@ -1562,7 +1561,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'), @@ -1643,7 +1642,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}") @@ -1652,10 +1651,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 = { @@ -1664,7 +1663,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'), @@ -1746,7 +1745,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}") @@ -1755,10 +1754,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 = { @@ -1767,7 +1766,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'), @@ -1848,7 +1847,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}") @@ -1857,10 +1856,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 = { @@ -1869,7 +1868,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'), @@ -1953,7 +1952,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}") @@ -1963,10 +1962,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 = { @@ -1975,7 +1974,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'), @@ -2052,7 +2051,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}") @@ -2061,10 +2060,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 = { @@ -2072,7 +2071,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'), @@ -2151,7 +2150,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}") @@ -2160,10 +2159,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 = { @@ -2171,7 +2170,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'), @@ -2250,7 +2249,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}") @@ -2259,10 +2258,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 = { @@ -2270,7 +2269,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'), @@ -2349,7 +2348,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}") @@ -2358,10 +2357,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 = { @@ -2369,7 +2368,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'), @@ -2451,7 +2450,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}") @@ -2461,10 +2460,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 = { @@ -2472,7 +2471,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'), @@ -2551,7 +2550,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}") @@ -2560,10 +2559,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 = { @@ -2571,7 +2570,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'), @@ -2653,7 +2652,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}") @@ -2663,10 +2662,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 = { @@ -2674,7 +2673,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'), @@ -2753,7 +2752,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}") @@ -2762,10 +2761,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 = { @@ -2773,7 +2772,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'), @@ -2889,7 +2888,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}") @@ -2919,14 +2918,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'), @@ -3044,7 +3043,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}") @@ -3081,14 +3080,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'), @@ -3206,7 +3205,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}") @@ -3243,14 +3242,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'), @@ -3338,7 +3337,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}") @@ -3347,24 +3346,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'), @@ -3496,7 +3495,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}") @@ -3536,14 +3535,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'), @@ -3659,7 +3658,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}") @@ -3695,14 +3694,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'), @@ -3808,7 +3807,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}") @@ -3817,10 +3816,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: @@ -3851,14 +3850,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'), @@ -3948,7 +3947,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}") @@ -3957,24 +3956,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'), @@ -4064,7 +4063,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}") @@ -4073,24 +4072,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'), @@ -4180,7 +4179,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}") @@ -4190,14 +4189,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'), @@ -4289,7 +4288,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}") @@ -4298,10 +4297,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 = { @@ -4311,7 +4310,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'), @@ -4402,7 +4401,7 @@ def start_sql_endpoint(self, sql_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"start_sql_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -4411,10 +4410,10 @@ def start_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 = { @@ -4424,7 +4423,7 @@ def start_sql_endpoint(self, sql_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'), @@ -4515,7 +4514,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}") @@ -4524,10 +4523,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 = { @@ -4537,7 +4536,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'), @@ -4628,7 +4627,7 @@ def stop_sql_endpoint(self, sql_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"stop_sql_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -4637,10 +4636,10 @@ def stop_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 = { @@ -4650,7 +4649,7 @@ def stop_sql_endpoint(self, sql_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'), @@ -4737,7 +4736,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}") @@ -4746,10 +4745,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 = { @@ -4758,7 +4757,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'), @@ -4848,7 +4847,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}") @@ -4857,10 +4856,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 = { @@ -4869,7 +4868,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'), @@ -4957,7 +4956,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}") @@ -4966,10 +4965,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 = { @@ -4978,7 +4977,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'), @@ -5064,7 +5063,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}") @@ -5073,10 +5072,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 = { @@ -5085,7 +5084,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'), @@ -5173,7 +5172,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}") @@ -5182,10 +5181,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 = { @@ -5194,7 +5193,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 d327554dad..49ae9d91e8 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 @@ -175,7 +174,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}") @@ -184,10 +183,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 = { @@ -197,7 +196,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'), @@ -292,7 +291,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}") @@ -302,10 +301,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 = { @@ -315,7 +314,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'), @@ -401,7 +400,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}") @@ -410,10 +409,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 = { @@ -422,7 +421,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'), @@ -513,7 +512,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}") @@ -523,10 +522,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 = { @@ -535,7 +534,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'), @@ -623,7 +622,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}") @@ -632,10 +631,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 = { @@ -644,7 +643,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'), @@ -732,7 +731,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}") @@ -741,10 +740,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 = { @@ -753,7 +752,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'), @@ -841,7 +840,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}") @@ -850,10 +849,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 = { @@ -862,7 +861,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'), @@ -950,7 +949,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}") @@ -959,10 +958,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 = { @@ -971,7 +970,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'), @@ -1059,7 +1058,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}") @@ -1068,10 +1067,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 = { @@ -1080,7 +1079,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'), @@ -1168,7 +1167,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}") @@ -1177,10 +1176,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 = { @@ -1189,7 +1188,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'), @@ -1277,7 +1276,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}") @@ -1286,10 +1285,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 = { @@ -1298,7 +1297,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'), @@ -1389,7 +1388,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}") @@ -1399,10 +1398,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 = { @@ -1411,7 +1410,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'), @@ -1511,7 +1510,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}") @@ -1522,10 +1521,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 = { @@ -1535,7 +1534,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'), @@ -1623,7 +1622,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}") @@ -1632,10 +1631,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 = { @@ -1644,7 +1643,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'), @@ -1735,7 +1734,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}") @@ -1745,10 +1744,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 = { @@ -1757,7 +1756,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'), @@ -1848,7 +1847,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}") @@ -1858,10 +1857,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 = { @@ -1870,7 +1869,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'), @@ -1959,7 +1958,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}") @@ -1968,10 +1967,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 = { @@ -1980,7 +1979,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'), @@ -2069,7 +2068,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}") @@ -2078,10 +2077,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 = { @@ -2090,7 +2089,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'), @@ -2178,7 +2177,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}") @@ -2187,10 +2186,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 = { @@ -2199,7 +2198,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'), @@ -2290,7 +2289,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}") @@ -2300,10 +2299,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 = { @@ -2312,7 +2311,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'), @@ -2400,7 +2399,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}") @@ -2409,10 +2408,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 = { @@ -2421,7 +2420,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'), @@ -2509,7 +2508,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}") @@ -2518,10 +2517,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 = { @@ -2530,7 +2529,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'), @@ -2618,7 +2617,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}") @@ -2627,10 +2626,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 = { @@ -2639,7 +2638,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'), @@ -2730,7 +2729,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}") @@ -2740,10 +2739,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 = { @@ -2752,7 +2751,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'), @@ -2840,7 +2839,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}") @@ -2849,10 +2848,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 = { @@ -2861,7 +2860,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'), @@ -2952,7 +2951,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}") @@ -2962,10 +2961,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 = { @@ -2974,7 +2973,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'), @@ -3065,7 +3064,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}") @@ -3075,10 +3074,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 = { @@ -3087,7 +3086,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'), @@ -3175,7 +3174,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}") @@ -3184,10 +3183,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 = { @@ -3196,7 +3195,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'), @@ -3284,7 +3283,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}") @@ -3293,10 +3292,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 = { @@ -3305,7 +3304,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'), @@ -3393,7 +3392,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}") @@ -3402,10 +3401,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 = { @@ -3414,7 +3413,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'), @@ -3499,7 +3498,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}") @@ -3510,7 +3509,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'), @@ -3596,7 +3595,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}") @@ -3606,10 +3605,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 = { @@ -3618,7 +3617,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'), @@ -3703,7 +3702,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}") @@ -3713,10 +3712,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 = { @@ -3725,7 +3724,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'), @@ -3810,7 +3809,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}") @@ -3820,10 +3819,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 = { @@ -3832,7 +3831,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'), @@ -3917,7 +3916,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}") @@ -3927,10 +3926,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 = { @@ -3939,7 +3938,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'), @@ -4024,7 +4023,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}") @@ -4034,10 +4033,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 = { @@ -4046,7 +4045,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'), @@ -4131,7 +4130,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}") @@ -4141,10 +4140,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 = { @@ -4153,7 +4152,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'), @@ -4238,7 +4237,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}") @@ -4248,10 +4247,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 = { @@ -4260,7 +4259,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'), @@ -4345,7 +4344,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}") @@ -4355,10 +4354,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 = { @@ -4367,7 +4366,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'), @@ -4452,7 +4451,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}") @@ -4462,10 +4461,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 = { @@ -4474,7 +4473,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'), @@ -4559,7 +4558,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}") @@ -4569,10 +4568,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 = { @@ -4581,7 +4580,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'), @@ -4666,7 +4665,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}") @@ -4676,10 +4675,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 = { @@ -4688,7 +4687,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'), @@ -4776,7 +4775,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}") @@ -4787,10 +4786,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 = { @@ -4799,7 +4798,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'), @@ -4887,7 +4886,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}") @@ -4898,10 +4897,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 = { @@ -4910,7 +4909,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'), @@ -4995,7 +4994,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}") @@ -5005,10 +5004,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 = { @@ -5017,7 +5016,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'), @@ -5102,7 +5101,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}") @@ -5112,10 +5111,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 = { @@ -5124,7 +5123,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'), @@ -5209,7 +5208,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}") @@ -5219,10 +5218,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 = { @@ -5231,7 +5230,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'), @@ -5319,7 +5318,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}") @@ -5330,10 +5329,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 = { @@ -5342,7 +5341,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'), @@ -5427,7 +5426,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}") @@ -5437,10 +5436,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 = { @@ -5449,7 +5448,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'), @@ -5534,7 +5533,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}") @@ -5544,10 +5543,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 = { @@ -5556,7 +5555,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'), @@ -5641,7 +5640,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}") @@ -5651,10 +5650,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 = { @@ -5663,7 +5662,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'), @@ -5751,7 +5750,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}") @@ -5762,10 +5761,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 = { @@ -5774,7 +5773,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'), @@ -5859,7 +5858,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}") @@ -5869,10 +5868,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 = { @@ -5881,7 +5880,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'), @@ -5969,7 +5968,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}") @@ -5980,10 +5979,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 = { @@ -5992,7 +5991,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'), @@ -6080,7 +6079,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}") @@ -6091,10 +6090,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 = { @@ -6103,7 +6102,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'), @@ -6188,7 +6187,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}") @@ -6198,10 +6197,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 = { @@ -6210,7 +6209,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'), @@ -6295,7 +6294,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}") @@ -6305,10 +6304,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 = { @@ -6317,7 +6316,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'), @@ -6402,7 +6401,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}") @@ -6412,10 +6411,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 = { @@ -6424,7 +6423,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'), @@ -6514,7 +6513,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}") @@ -6523,17 +6522,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", @@ -6541,7 +6540,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'), @@ -6622,7 +6621,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}") @@ -6632,10 +6631,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 = { @@ -6643,7 +6642,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'), @@ -6724,7 +6723,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}") @@ -6734,10 +6733,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 = { @@ -6745,7 +6744,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'), @@ -6829,7 +6828,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}") @@ -6839,23 +6838,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'), @@ -6938,7 +6937,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}") @@ -6948,10 +6947,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 = { @@ -6959,7 +6958,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'), @@ -7040,7 +7039,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}") @@ -7050,10 +7049,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 = { @@ -7061,7 +7060,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'), @@ -7142,7 +7141,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}") @@ -7152,10 +7151,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 = { @@ -7163,7 +7162,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'), @@ -7245,7 +7244,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}") @@ -7255,10 +7254,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 = { @@ -7266,7 +7265,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'), @@ -7347,7 +7346,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}") @@ -7357,10 +7356,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 = { @@ -7368,7 +7367,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'), @@ -7455,7 +7454,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}") @@ -7467,10 +7466,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 = { @@ -7478,7 +7477,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'), @@ -7563,7 +7562,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}") @@ -7573,23 +7572,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'), @@ -7672,7 +7671,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}") @@ -7682,10 +7681,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 = { @@ -7693,7 +7692,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'), @@ -7777,7 +7776,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}") @@ -7788,10 +7787,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 = { @@ -7799,7 +7798,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'), @@ -7880,7 +7879,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}") @@ -7890,10 +7889,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 = { @@ -7901,7 +7900,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'), @@ -7982,7 +7981,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}") @@ -7992,10 +7991,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 = { @@ -8003,7 +8002,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'), @@ -8084,7 +8083,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}") @@ -8094,10 +8093,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 = { @@ -8105,7 +8104,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'), @@ -8189,7 +8188,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}") @@ -8200,10 +8199,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 = { @@ -8211,7 +8210,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'), @@ -8295,7 +8294,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}") @@ -8306,10 +8305,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 = { @@ -8317,7 +8316,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'), @@ -8404,7 +8403,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}") @@ -8414,10 +8413,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: @@ -8431,14 +8430,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'), @@ -8527,7 +8526,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}") @@ -8537,10 +8536,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: @@ -8554,14 +8553,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'), @@ -8656,7 +8655,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}") @@ -8666,24 +8665,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'), @@ -8769,7 +8768,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}") @@ -8780,10 +8779,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 = { @@ -8791,7 +8790,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'), @@ -8876,7 +8875,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}") @@ -8886,23 +8885,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'), @@ -8985,7 +8984,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}") @@ -8995,10 +8994,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 = { @@ -9006,7 +9005,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'), @@ -9093,7 +9092,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}") @@ -9103,10 +9102,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: @@ -9120,14 +9119,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'), @@ -9217,7 +9216,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}") @@ -9228,23 +9227,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'), @@ -9330,7 +9329,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}") @@ -9341,10 +9340,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 = { @@ -9352,7 +9351,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'), @@ -9439,7 +9438,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}") @@ -9451,10 +9450,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 = { @@ -9462,7 +9461,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'), @@ -9550,7 +9549,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}") @@ -9561,23 +9560,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'), @@ -9663,7 +9662,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}") @@ -9674,10 +9673,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 = { @@ -9685,7 +9684,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'), @@ -9769,7 +9768,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}") @@ -9780,10 +9779,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 = { @@ -9791,7 +9790,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'), @@ -9876,7 +9875,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}") @@ -9886,23 +9885,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'), @@ -9988,7 +9987,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}") @@ -9999,10 +9998,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 = { @@ -10010,7 +10009,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'), @@ -10094,7 +10093,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}") @@ -10105,10 +10104,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 = { @@ -10116,7 +10115,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'), @@ -10197,7 +10196,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}") @@ -10207,10 +10206,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 = { @@ -10218,7 +10217,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'), @@ -10299,7 +10298,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}") @@ -10309,10 +10308,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 = { @@ -10320,7 +10319,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'), @@ -10401,7 +10400,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}") @@ -10411,10 +10410,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 = { @@ -10422,7 +10421,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'), @@ -10503,7 +10502,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}") @@ -10513,10 +10512,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 = { @@ -10524,7 +10523,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'), @@ -10602,7 +10601,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}") @@ -10611,10 +10610,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 = { @@ -10622,7 +10621,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'), @@ -10700,7 +10699,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}") @@ -10709,10 +10708,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 = { @@ -10720,7 +10719,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'), @@ -10838,7 +10837,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}") @@ -10847,10 +10846,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: @@ -10877,14 +10876,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'), @@ -11004,7 +11003,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}") @@ -11013,10 +11012,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: @@ -11043,14 +11042,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'), @@ -11169,7 +11168,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}") @@ -11178,10 +11177,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: @@ -11208,14 +11207,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'), @@ -11343,7 +11342,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}") @@ -11352,10 +11351,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: @@ -11397,14 +11396,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'), @@ -11520,7 +11519,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}") @@ -11529,10 +11528,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: @@ -11558,14 +11557,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'), @@ -11699,7 +11698,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}") @@ -11710,10 +11709,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: @@ -11742,14 +11741,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'), @@ -11869,7 +11868,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}") @@ -11878,10 +11877,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: @@ -11908,14 +11907,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'), @@ -12035,7 +12034,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}") @@ -12044,10 +12043,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: @@ -12074,14 +12073,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'), @@ -12216,7 +12215,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}") @@ -12226,10 +12225,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: @@ -12258,14 +12257,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'), @@ -12396,7 +12395,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}") @@ -12406,10 +12405,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: @@ -12438,14 +12437,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'), @@ -12568,7 +12567,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}") @@ -12577,10 +12576,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: @@ -12608,14 +12607,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'), @@ -12743,7 +12742,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}") @@ -12752,10 +12751,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: @@ -12797,14 +12796,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'), @@ -12923,7 +12922,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}") @@ -12933,10 +12932,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: @@ -12962,14 +12961,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'), @@ -13084,7 +13083,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}") @@ -13094,10 +13093,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: @@ -13122,14 +13121,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'), @@ -13253,7 +13252,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}") @@ -13262,10 +13261,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: @@ -13293,14 +13292,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'), @@ -13420,7 +13419,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}") @@ -13429,10 +13428,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: @@ -13459,14 +13458,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'), @@ -13594,7 +13593,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}") @@ -13603,10 +13602,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: @@ -13648,14 +13647,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'), @@ -13774,7 +13773,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}") @@ -13784,10 +13783,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: @@ -13813,14 +13812,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'), @@ -13939,7 +13938,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}") @@ -13949,10 +13948,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: @@ -13978,14 +13977,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'), @@ -14105,7 +14104,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}") @@ -14114,10 +14113,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: @@ -14144,14 +14143,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'), @@ -14271,7 +14270,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}") @@ -14280,10 +14279,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: @@ -14310,14 +14309,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'), @@ -14437,7 +14436,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}") @@ -14446,10 +14445,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: @@ -14476,14 +14475,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'), @@ -14622,7 +14621,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}") @@ -14632,10 +14631,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: @@ -14665,14 +14664,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'), @@ -14783,7 +14782,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}") @@ -14793,10 +14792,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: @@ -14820,14 +14819,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'), @@ -14957,7 +14956,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}") @@ -14968,10 +14967,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: @@ -14999,14 +14998,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'), @@ -15141,7 +15140,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}") @@ -15151,10 +15150,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: @@ -15184,14 +15183,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'), @@ -15314,7 +15313,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}") @@ -15324,10 +15323,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: @@ -15354,14 +15353,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'), @@ -15487,7 +15486,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}") @@ -15497,10 +15496,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: @@ -15528,14 +15527,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'), @@ -15666,7 +15665,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}") @@ -15676,10 +15675,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: @@ -15708,14 +15707,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'), @@ -15825,7 +15824,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}") @@ -15836,10 +15835,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: @@ -15862,14 +15861,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'), @@ -16008,7 +16007,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}") @@ -16018,10 +16017,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: @@ -16052,14 +16051,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'), @@ -16186,7 +16185,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}") @@ -16196,10 +16195,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: @@ -16227,14 +16226,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'), @@ -16354,7 +16353,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}") @@ -16363,10 +16362,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: @@ -16393,14 +16392,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'), @@ -16528,7 +16527,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}") @@ -16537,10 +16536,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: @@ -16569,14 +16568,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'), @@ -16692,7 +16691,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}") @@ -16701,10 +16700,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: @@ -16730,14 +16729,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'), @@ -16857,7 +16856,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}") @@ -16866,10 +16865,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: @@ -16896,14 +16895,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'), @@ -17023,7 +17022,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}") @@ -17032,10 +17031,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: @@ -17062,14 +17061,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'), @@ -17173,7 +17172,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}") @@ -17182,10 +17181,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: @@ -17208,14 +17207,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'), @@ -17319,7 +17318,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}") @@ -17328,10 +17327,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: @@ -17354,14 +17353,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'), @@ -17475,7 +17474,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}") @@ -17510,14 +17509,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'), @@ -17629,7 +17628,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}") @@ -17664,14 +17663,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'), @@ -17759,7 +17758,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}") @@ -17768,10 +17767,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 = { @@ -17781,7 +17780,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'), @@ -17876,7 +17875,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}") @@ -17885,17 +17884,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", @@ -17904,7 +17903,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'), @@ -17995,7 +17994,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}") @@ -18005,10 +18004,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 = { @@ -18017,7 +18016,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'), @@ -18109,7 +18108,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}") @@ -18119,10 +18118,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 = { @@ -18131,7 +18130,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'), @@ -18223,7 +18222,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}") @@ -18233,10 +18232,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 = { @@ -18245,7 +18244,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'), @@ -18337,7 +18336,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}") @@ -18347,10 +18346,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 = { @@ -18359,7 +18358,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'), @@ -18451,7 +18450,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}") @@ -18461,10 +18460,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 = { @@ -18473,7 +18472,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'), @@ -18565,7 +18564,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}") @@ -18575,10 +18574,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 = { @@ -18587,7 +18586,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'), @@ -18679,7 +18678,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}") @@ -18689,10 +18688,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 = { @@ -18701,7 +18700,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'), @@ -18793,7 +18792,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}") @@ -18803,10 +18802,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 = { @@ -18815,7 +18814,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'), @@ -18907,7 +18906,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}") @@ -18917,10 +18916,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 = { @@ -18929,7 +18928,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'), @@ -19024,7 +19023,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}") @@ -19035,10 +19034,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 = { @@ -19047,7 +19046,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'), @@ -19139,7 +19138,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}") @@ -19149,10 +19148,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 = { @@ -19161,7 +19160,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'), @@ -19253,7 +19252,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}") @@ -19263,10 +19262,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 = { @@ -19275,7 +19274,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'), @@ -19367,7 +19366,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}") @@ -19377,10 +19376,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 = { @@ -19389,7 +19388,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'), @@ -19481,7 +19480,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}") @@ -19491,10 +19490,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 = { @@ -19503,7 +19502,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'), @@ -19595,7 +19594,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}") @@ -19605,10 +19604,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 = { @@ -19617,7 +19616,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'), @@ -19716,7 +19715,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}") @@ -19727,10 +19726,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 = { @@ -19740,7 +19739,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'), @@ -19836,7 +19835,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}") @@ -19847,10 +19846,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 = { @@ -19859,7 +19858,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'), @@ -19951,7 +19950,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}") @@ -19961,10 +19960,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 = { @@ -19973,7 +19972,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'), @@ -20068,7 +20067,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}") @@ -20079,10 +20078,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 = { @@ -20091,7 +20090,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'), @@ -20186,7 +20185,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}") @@ -20197,10 +20196,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 = { @@ -20209,7 +20208,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'), @@ -20301,7 +20300,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}") @@ -20311,10 +20310,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 = { @@ -20323,7 +20322,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'), @@ -20412,7 +20411,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}") @@ -20421,10 +20420,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 = { @@ -20433,7 +20432,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 4c4c01e1d4..caf574b356 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 @@ -179,7 +178,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}") @@ -188,10 +187,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 = { @@ -201,7 +200,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'), @@ -291,7 +290,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}") @@ -300,10 +299,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 = { @@ -312,7 +311,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'), @@ -398,7 +397,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}") @@ -409,7 +408,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'), @@ -496,7 +495,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}") @@ -505,10 +504,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 = { @@ -517,7 +516,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'), @@ -612,7 +611,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}") @@ -621,10 +620,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 = { @@ -634,7 +633,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'), @@ -713,7 +712,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}") @@ -722,10 +721,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 = { @@ -733,7 +732,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'), @@ -811,7 +810,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}") @@ -820,10 +819,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 = { @@ -831,7 +830,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'), @@ -928,7 +927,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}") @@ -937,10 +936,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 = { @@ -950,7 +949,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'), @@ -1043,7 +1042,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}") @@ -1061,14 +1060,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'), @@ -1184,7 +1183,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}") @@ -1221,14 +1220,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'), @@ -1314,7 +1313,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}") @@ -1323,24 +1322,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'), @@ -1428,7 +1427,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}") @@ -1437,24 +1436,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'), @@ -1546,7 +1545,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}") @@ -1557,14 +1556,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'), @@ -1661,7 +1660,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}") @@ -1670,10 +1669,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 = { @@ -1683,7 +1682,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'), @@ -1781,7 +1780,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}") @@ -1790,10 +1789,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 = { @@ -1803,7 +1802,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'), @@ -1902,7 +1901,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}") @@ -1911,10 +1910,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 = { @@ -1924,7 +1923,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'), @@ -2014,7 +2013,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}") @@ -2023,10 +2022,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 = { @@ -2035,7 +2034,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 13a98621cc..e0004a8a8a 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 @@ -168,7 +167,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}") @@ -179,7 +178,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'), @@ -266,7 +265,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}") @@ -277,7 +276,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'), @@ -364,7 +363,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}") @@ -373,10 +372,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 = { @@ -385,7 +384,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'), @@ -469,7 +468,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}") @@ -478,10 +477,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 = { @@ -490,7 +489,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'), @@ -566,7 +565,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}") @@ -575,10 +574,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 = { @@ -586,7 +585,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'), @@ -664,7 +663,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}") @@ -673,10 +672,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 = { @@ -684,7 +683,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'), @@ -762,7 +761,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}") @@ -771,10 +770,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 = { @@ -782,7 +781,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'), @@ -868,7 +867,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}") @@ -877,10 +876,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 = { @@ -889,7 +888,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'), @@ -975,7 +974,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}") @@ -984,10 +983,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 = { @@ -996,7 +995,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'), @@ -1123,7 +1122,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}") @@ -1163,14 +1162,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'), @@ -1293,7 +1292,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}") @@ -1332,14 +1331,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'), @@ -1456,7 +1455,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}") @@ -1500,14 +1499,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'), @@ -1620,7 +1619,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}") @@ -1663,14 +1662,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'), @@ -1759,7 +1758,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}") @@ -1768,10 +1767,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 = { @@ -1780,7 +1779,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'), @@ -1871,7 +1870,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}") @@ -1880,10 +1879,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 = { @@ -1892,7 +1891,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 dacc38eccf..ff5d2311a4 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 @@ -179,7 +178,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}") @@ -188,10 +187,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 = { @@ -201,7 +200,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'), @@ -291,7 +290,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}") @@ -300,10 +299,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 = { @@ -312,7 +311,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'), @@ -417,7 +416,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}") @@ -433,7 +432,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", @@ -442,7 +441,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'), @@ -535,7 +534,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}") @@ -544,10 +543,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 = { @@ -556,7 +555,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'), @@ -657,7 +656,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}") @@ -666,10 +665,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 = { @@ -679,7 +678,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'), @@ -776,7 +775,7 @@ def apply_security_assessment_template(self, security_assessment_id, security_as "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_security_assessment_template got unknown kwargs: {extra_kwargs!r}") @@ -785,10 +784,10 @@ def apply_security_assessment_template(self, security_assessment_id, security_as "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 = { @@ -798,7 +797,7 @@ def apply_security_assessment_template(self, security_assessment_id, security_as "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 bulk_create_sensitive_types(self, bulk_create_sensitive_types_details, opc_c "buffer_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"bulk_create_sensitive_types got unknown kwargs: {extra_kwargs!r}") @@ -898,7 +897,7 @@ def bulk_create_sensitive_types(self, bulk_create_sensitive_types_details, opc_c "opc-compartment-id": opc_compartment_id, "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v 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: @@ -907,7 +906,7 @@ def bulk_create_sensitive_types(self, bulk_create_sensitive_types_details, opc_c bulk_create_sensitive_types_details = kwargs.get("bulk_create_sensitive_types_details", missing) if bulk_create_sensitive_types_details is not missing and bulk_create_sensitive_types_details is not None: - if (not isinstance(bulk_create_sensitive_types_details, (six.binary_type, six.string_types)) and + if (not isinstance(bulk_create_sensitive_types_details, (bytes, str)) and not hasattr(bulk_create_sensitive_types_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -1002,7 +1001,7 @@ def bulk_create_sql_firewall_allowed_sqls(self, bulk_create_sql_firewall_allowed "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_sql_firewall_allowed_sqls got unknown kwargs: {extra_kwargs!r}") @@ -1013,7 +1012,7 @@ def bulk_create_sql_firewall_allowed_sqls(self, bulk_create_sql_firewall_allowed "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 bulk_create_unified_audit_policy(self, bulk_create_unified_audit_policy_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"bulk_create_unified_audit_policy got unknown kwargs: {extra_kwargs!r}") @@ -1108,7 +1107,7 @@ def bulk_create_unified_audit_policy(self, bulk_create_unified_audit_policy_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'), @@ -1185,7 +1184,7 @@ def bulk_delete_sql_firewall_allowed_sqls(self, bulk_delete_sql_firewall_allowed "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_sql_firewall_allowed_sqls got unknown kwargs: {extra_kwargs!r}") @@ -1195,7 +1194,7 @@ def bulk_delete_sql_firewall_allowed_sqls(self, bulk_delete_sql_firewall_allowed "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -1298,10 +1297,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 = { @@ -1311,7 +1310,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'), @@ -1408,7 +1407,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}") @@ -1417,10 +1416,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 = { @@ -1430,7 +1429,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'), @@ -1517,7 +1516,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}") @@ -1526,10 +1525,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 = { @@ -1538,7 +1537,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'), @@ -1632,7 +1631,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}") @@ -1641,10 +1640,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 = { @@ -1654,7 +1653,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'), @@ -1751,7 +1750,7 @@ def change_alert_policy_compartment(self, alert_policy_id, change_alert_policy_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_alert_policy_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1760,10 +1759,10 @@ def change_alert_policy_compartment(self, alert_policy_id, change_alert_policy_c "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 = { @@ -1773,7 +1772,7 @@ def change_alert_policy_compartment(self, alert_policy_id, change_alert_policy_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'), @@ -1870,7 +1869,7 @@ def change_attribute_set_compartment(self, attribute_set_id, change_attribute_se "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_attribute_set_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1879,10 +1878,10 @@ def change_attribute_set_compartment(self, attribute_set_id, change_attribute_se "attributeSetId": attribute_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 = { @@ -1892,7 +1891,7 @@ def change_attribute_set_compartment(self, attribute_set_id, change_attribute_se "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -1998,10 +1997,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 = { @@ -2011,7 +2010,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'), @@ -2108,7 +2107,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}") @@ -2117,10 +2116,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 = { @@ -2130,7 +2129,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'), @@ -2227,7 +2226,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}") @@ -2236,10 +2235,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 = { @@ -2249,7 +2248,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'), @@ -2339,7 +2338,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}") @@ -2348,10 +2347,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 = { @@ -2360,7 +2359,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'), @@ -2456,7 +2455,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}") @@ -2465,10 +2464,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 = { @@ -2478,7 +2477,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'), @@ -2575,7 +2574,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}") @@ -2584,10 +2583,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 = { @@ -2597,7 +2596,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'), @@ -2694,7 +2693,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}") @@ -2703,10 +2702,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 = { @@ -2716,7 +2715,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'), @@ -2813,7 +2812,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}") @@ -2822,10 +2821,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 = { @@ -2835,7 +2834,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'), @@ -2932,7 +2931,7 @@ def change_masking_policy_health_report_compartment(self, masking_policy_health_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_health_report_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2941,10 +2940,10 @@ def change_masking_policy_health_report_compartment(self, masking_policy_health_ "maskingPolicyHealthReportId": masking_policy_health_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 = { @@ -2954,7 +2953,7 @@ def change_masking_policy_health_report_compartment(self, masking_policy_health_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3051,7 +3050,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}") @@ -3060,10 +3059,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 = { @@ -3073,7 +3072,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'), @@ -3170,7 +3169,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}") @@ -3179,10 +3178,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 = { @@ -3192,7 +3191,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'), @@ -3289,7 +3288,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}") @@ -3298,10 +3297,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 = { @@ -3311,7 +3310,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'), @@ -3408,7 +3407,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}") @@ -3417,10 +3416,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 = { @@ -3430,7 +3429,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'), @@ -3527,7 +3526,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}") @@ -3536,10 +3535,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 = { @@ -3549,7 +3548,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'), @@ -3650,7 +3649,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}") @@ -3659,10 +3658,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 = { @@ -3672,7 +3671,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'), @@ -3769,7 +3768,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}") @@ -3778,10 +3777,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 = { @@ -3791,7 +3790,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'), @@ -3888,7 +3887,7 @@ def change_security_policy_config_compartment(self, security_policy_config_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_security_policy_config_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3897,10 +3896,10 @@ def change_security_policy_config_compartment(self, security_policy_config_id, c "securityPolicyConfigId": security_policy_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 = { @@ -3910,7 +3909,7 @@ def change_security_policy_config_compartment(self, security_policy_config_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'), @@ -4007,7 +4006,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}") @@ -4016,10 +4015,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 = { @@ -4029,7 +4028,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'), @@ -4126,7 +4125,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}") @@ -4135,10 +4134,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 = { @@ -4148,7 +4147,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'), @@ -4245,7 +4244,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}") @@ -4254,10 +4253,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 = { @@ -4267,7 +4266,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'), @@ -4364,7 +4363,7 @@ def change_sensitive_type_group_compartment(self, sensitive_type_group_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_type_group_compartment got unknown kwargs: {extra_kwargs!r}") @@ -4373,10 +4372,10 @@ def change_sensitive_type_group_compartment(self, sensitive_type_group_id, chang "sensitiveTypeGroupId": sensitive_type_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 = { @@ -4386,7 +4385,7 @@ def change_sensitive_type_group_compartment(self, sensitive_type_group_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'), @@ -4483,7 +4482,7 @@ def change_sensitive_types_export_compartment(self, sensitive_types_export_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_sensitive_types_export_compartment got unknown kwargs: {extra_kwargs!r}") @@ -4492,10 +4491,10 @@ def change_sensitive_types_export_compartment(self, sensitive_types_export_id, c "sensitiveTypesExportId": sensitive_types_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 = { @@ -4505,7 +4504,7 @@ def change_sensitive_types_export_compartment(self, sensitive_types_export_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'), @@ -4602,7 +4601,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}") @@ -4611,10 +4610,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 = { @@ -4624,7 +4623,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'), @@ -4721,7 +4720,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}") @@ -4730,10 +4729,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 = { @@ -4743,7 +4742,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'), @@ -4840,7 +4839,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}") @@ -4849,10 +4848,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 = { @@ -4862,7 +4861,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'), @@ -4959,7 +4958,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}") @@ -4968,10 +4967,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 = { @@ -4981,7 +4980,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'), @@ -5078,7 +5077,7 @@ def change_target_database_group_compartment(self, target_database_group_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_target_database_group_compartment got unknown kwargs: {extra_kwargs!r}") @@ -5087,10 +5086,10 @@ def change_target_database_group_compartment(self, target_database_group_id, cha "targetDatabaseGroupId": target_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 = { @@ -5100,7 +5099,7 @@ def change_target_database_group_compartment(self, target_database_group_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'), @@ -5197,7 +5196,7 @@ def change_unified_audit_policy_compartment(self, unified_audit_policy_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_unified_audit_policy_compartment got unknown kwargs: {extra_kwargs!r}") @@ -5206,10 +5205,10 @@ def change_unified_audit_policy_compartment(self, unified_audit_policy_id, chang "unifiedAuditPolicyId": unified_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 = { @@ -5219,7 +5218,7 @@ def change_unified_audit_policy_compartment(self, unified_audit_policy_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'), @@ -5316,7 +5315,7 @@ def change_unified_audit_policy_definition_compartment(self, unified_audit_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_unified_audit_policy_definition_compartment got unknown kwargs: {extra_kwargs!r}") @@ -5325,10 +5324,10 @@ def change_unified_audit_policy_definition_compartment(self, unified_audit_polic "unifiedAuditPolicyDefinitionId": unified_audit_policy_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 = { @@ -5338,7 +5337,7 @@ def change_unified_audit_policy_definition_compartment(self, unified_audit_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'), @@ -5439,7 +5438,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}") @@ -5448,10 +5447,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 = { @@ -5461,7 +5460,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'), @@ -5559,7 +5558,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}") @@ -5568,10 +5567,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 = { @@ -5581,7 +5580,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'), @@ -5678,7 +5677,7 @@ def compare_to_template_baseline(self, security_assessment_id, compare_to_templa "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_to_template_baseline got unknown kwargs: {extra_kwargs!r}") @@ -5687,10 +5686,10 @@ def compare_to_template_baseline(self, security_assessment_id, compare_to_templa "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 = { @@ -5700,7 +5699,7 @@ def compare_to_template_baseline(self, security_assessment_id, compare_to_templa "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5798,7 +5797,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}") @@ -5807,10 +5806,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 = { @@ -5820,7 +5819,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'), @@ -5906,7 +5905,7 @@ def create_alert_policy(self, create_alert_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_alert_policy got unknown kwargs: {extra_kwargs!r}") @@ -5917,7 +5916,7 @@ def create_alert_policy(self, create_alert_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'), @@ -6006,7 +6005,7 @@ def create_alert_policy_rule(self, create_alert_policy_rule_details, alert_polic "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_policy_rule got unknown kwargs: {extra_kwargs!r}") @@ -6015,10 +6014,10 @@ def create_alert_policy_rule(self, create_alert_policy_rule_details, alert_polic "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 = { @@ -6027,7 +6026,7 @@ def create_alert_policy_rule(self, create_alert_policy_rule_details, alert_polic "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6115,7 +6114,7 @@ def create_attribute_set(self, create_attribute_set_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_attribute_set got unknown kwargs: {extra_kwargs!r}") @@ -6126,7 +6125,7 @@ def create_attribute_set(self, create_attribute_set_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'), @@ -6214,7 +6213,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}") @@ -6225,7 +6224,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'), @@ -6311,7 +6310,7 @@ def create_audit_profile(self, create_audit_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_audit_profile got unknown kwargs: {extra_kwargs!r}") @@ -6322,7 +6321,7 @@ def create_audit_profile(self, create_audit_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'), @@ -6408,7 +6407,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}") @@ -6419,7 +6418,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'), @@ -6509,7 +6508,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}") @@ -6520,7 +6519,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'), @@ -6610,7 +6609,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}") @@ -6621,7 +6620,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'), @@ -6729,7 +6728,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}") @@ -6738,10 +6737,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 = { @@ -6750,7 +6749,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'), @@ -6852,7 +6851,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}") @@ -6863,7 +6862,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'), @@ -6949,7 +6948,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}") @@ -6960,7 +6959,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'), @@ -7057,7 +7056,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}") @@ -7066,10 +7065,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 = { @@ -7079,7 +7078,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'), @@ -7170,7 +7169,7 @@ def create_referential_relation(self, sensitive_data_model_id, create_referentia "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_referential_relation got unknown kwargs: {extra_kwargs!r}") @@ -7179,10 +7178,10 @@ def create_referential_relation(self, sensitive_data_model_id, create_referentia "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 = { @@ -7191,7 +7190,7 @@ def create_referential_relation(self, sensitive_data_model_id, create_referentia "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -7288,7 +7287,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'), @@ -7378,7 +7377,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}") @@ -7389,7 +7388,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'), @@ -7479,7 +7478,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}") @@ -7490,7 +7489,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'), @@ -7576,7 +7575,7 @@ def create_security_policy(self, create_security_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_security_policy got unknown kwargs: {extra_kwargs!r}") @@ -7587,7 +7586,7 @@ def create_security_policy(self, create_security_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'), @@ -7673,7 +7672,7 @@ def create_security_policy_config(self, create_security_policy_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_security_policy_config got unknown kwargs: {extra_kwargs!r}") @@ -7684,7 +7683,7 @@ def create_security_policy_config(self, create_security_policy_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'), @@ -7770,7 +7769,7 @@ def create_security_policy_deployment(self, create_security_policy_deployment_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_security_policy_deployment got unknown kwargs: {extra_kwargs!r}") @@ -7781,7 +7780,7 @@ def create_security_policy_deployment(self, create_security_policy_deployment_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'), @@ -7870,7 +7869,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}") @@ -7879,10 +7878,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 = { @@ -7891,7 +7890,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'), @@ -7979,7 +7978,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}") @@ -7990,7 +7989,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'), @@ -8078,7 +8077,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}") @@ -8089,7 +8088,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'), @@ -8175,7 +8174,7 @@ def create_sensitive_type_group(self, create_sensitive_type_group_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_type_group got unknown kwargs: {extra_kwargs!r}") @@ -8186,7 +8185,7 @@ def create_sensitive_type_group(self, create_sensitive_type_group_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'), @@ -8274,7 +8273,7 @@ def create_sensitive_types_export(self, create_sensitive_types_export_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_sensitive_types_export got unknown kwargs: {extra_kwargs!r}") @@ -8285,7 +8284,7 @@ def create_sensitive_types_export(self, create_sensitive_types_export_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'), @@ -8371,7 +8370,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}") @@ -8382,7 +8381,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'), @@ -8468,7 +8467,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}") @@ -8479,7 +8478,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'), @@ -8565,7 +8564,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}") @@ -8576,7 +8575,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'), @@ -8662,7 +8661,7 @@ def create_target_database_group(self, create_target_database_group_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_target_database_group got unknown kwargs: {extra_kwargs!r}") @@ -8673,7 +8672,7 @@ def create_target_database_group(self, create_target_database_group_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'), @@ -8759,7 +8758,7 @@ def create_unified_audit_policy(self, create_unified_audit_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_unified_audit_policy got unknown kwargs: {extra_kwargs!r}") @@ -8770,7 +8769,7 @@ def create_unified_audit_policy(self, create_unified_audit_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'), @@ -8860,7 +8859,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}") @@ -8871,7 +8870,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'), @@ -8965,7 +8964,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}") @@ -8974,10 +8973,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 = { @@ -8987,7 +8986,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'), @@ -9072,7 +9071,7 @@ def delete_alert_policy(self, alert_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_alert_policy got unknown kwargs: {extra_kwargs!r}") @@ -9081,10 +9080,10 @@ def delete_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 = { @@ -9093,7 +9092,7 @@ def delete_alert_policy(self, alert_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'), @@ -9180,7 +9179,7 @@ def delete_alert_policy_rule(self, alert_policy_id, rule_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_alert_policy_rule got unknown kwargs: {extra_kwargs!r}") @@ -9190,10 +9189,10 @@ def delete_alert_policy_rule(self, alert_policy_id, rule_key, **kwargs): "ruleKey": 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 = { @@ -9202,7 +9201,7 @@ def delete_alert_policy_rule(self, alert_policy_id, rule_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'), @@ -9286,7 +9285,7 @@ def delete_attribute_set(self, attribute_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_attribute_set got unknown kwargs: {extra_kwargs!r}") @@ -9295,10 +9294,10 @@ def delete_attribute_set(self, attribute_set_id, **kwargs): "attributeSetId": attribute_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 = { @@ -9307,7 +9306,7 @@ def delete_attribute_set(self, attribute_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'), @@ -9392,7 +9391,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}") @@ -9401,10 +9400,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 = { @@ -9413,7 +9412,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'), @@ -9498,7 +9497,7 @@ def delete_audit_profile(self, audit_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_audit_profile got unknown kwargs: {extra_kwargs!r}") @@ -9507,10 +9506,10 @@ def delete_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 = { @@ -9519,7 +9518,7 @@ def delete_audit_profile(self, audit_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'), @@ -9603,7 +9602,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}") @@ -9612,10 +9611,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 = { @@ -9624,7 +9623,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'), @@ -9708,7 +9707,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}") @@ -9717,10 +9716,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 = { @@ -9729,7 +9728,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'), @@ -9813,7 +9812,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}") @@ -9822,10 +9821,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 = { @@ -9834,7 +9833,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'), @@ -9921,7 +9920,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}") @@ -9931,10 +9930,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 = { @@ -9943,7 +9942,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'), @@ -10027,7 +10026,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}") @@ -10036,10 +10035,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 = { @@ -10048,7 +10047,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'), @@ -10135,7 +10134,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}") @@ -10145,10 +10144,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 = { @@ -10157,7 +10156,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'), @@ -10241,7 +10240,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}") @@ -10250,10 +10249,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 = { @@ -10262,7 +10261,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'), @@ -10346,7 +10345,7 @@ def delete_masking_policy_health_report(self, masking_policy_health_report_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_masking_policy_health_report got unknown kwargs: {extra_kwargs!r}") @@ -10355,10 +10354,10 @@ def delete_masking_policy_health_report(self, masking_policy_health_report_id, * "maskingPolicyHealthReportId": masking_policy_health_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 = { @@ -10367,7 +10366,7 @@ def delete_masking_policy_health_report(self, masking_policy_health_report_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'), @@ -10451,7 +10450,7 @@ def delete_masking_report(self, masking_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_masking_report got unknown kwargs: {extra_kwargs!r}") @@ -10460,10 +10459,10 @@ def delete_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 = { @@ -10472,7 +10471,7 @@ def delete_masking_report(self, masking_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'), @@ -10556,7 +10555,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}") @@ -10565,10 +10564,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 = { @@ -10577,7 +10576,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'), @@ -10664,7 +10663,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}") @@ -10674,10 +10673,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 = { @@ -10686,7 +10685,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'), @@ -10773,7 +10772,7 @@ def delete_referential_relation(self, sensitive_data_model_id, referential_relat "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_referential_relation got unknown kwargs: {extra_kwargs!r}") @@ -10783,10 +10782,10 @@ def delete_referential_relation(self, sensitive_data_model_id, referential_relat "referentialRelationKey": referential_relation_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 = { @@ -10795,7 +10794,7 @@ def delete_referential_relation(self, sensitive_data_model_id, referential_relat "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10879,7 +10878,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}") @@ -10888,10 +10887,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 = { @@ -10900,7 +10899,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'), @@ -10984,7 +10983,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}") @@ -10993,10 +10992,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 = { @@ -11005,7 +11004,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'), @@ -11092,7 +11091,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}") @@ -11101,10 +11100,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 = { @@ -11113,7 +11112,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'), @@ -11197,7 +11196,7 @@ def delete_security_policy(self, security_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_security_policy got unknown kwargs: {extra_kwargs!r}") @@ -11206,10 +11205,10 @@ def delete_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 = { @@ -11218,7 +11217,7 @@ def delete_security_policy(self, security_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'), @@ -11302,7 +11301,7 @@ def delete_security_policy_config(self, security_policy_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_security_policy_config got unknown kwargs: {extra_kwargs!r}") @@ -11311,10 +11310,10 @@ def delete_security_policy_config(self, security_policy_config_id, **kwargs): "securityPolicyConfigId": security_policy_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 = { @@ -11323,7 +11322,7 @@ def delete_security_policy_config(self, security_policy_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'), @@ -11407,7 +11406,7 @@ def delete_security_policy_deployment(self, security_policy_deployment_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_security_policy_deployment got unknown kwargs: {extra_kwargs!r}") @@ -11416,10 +11415,10 @@ def delete_security_policy_deployment(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') header_params = { @@ -11428,7 +11427,7 @@ def delete_security_policy_deployment(self, security_policy_deployment_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'), @@ -11515,7 +11514,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}") @@ -11525,10 +11524,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 = { @@ -11537,7 +11536,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'), @@ -11621,7 +11620,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}") @@ -11630,10 +11629,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 = { @@ -11642,7 +11641,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'), @@ -11726,7 +11725,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}") @@ -11735,10 +11734,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 = { @@ -11747,7 +11746,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'), @@ -11831,7 +11830,7 @@ def delete_sensitive_type_group(self, sensitive_type_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_sensitive_type_group got unknown kwargs: {extra_kwargs!r}") @@ -11840,10 +11839,10 @@ def delete_sensitive_type_group(self, sensitive_type_group_id, **kwargs): "sensitiveTypeGroupId": sensitive_type_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 = { @@ -11852,7 +11851,7 @@ def delete_sensitive_type_group(self, sensitive_type_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'), @@ -11936,7 +11935,7 @@ def delete_sensitive_types_export(self, sensitive_types_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_sensitive_types_export got unknown kwargs: {extra_kwargs!r}") @@ -11945,10 +11944,10 @@ def delete_sensitive_types_export(self, sensitive_types_export_id, **kwargs): "sensitiveTypesExportId": sensitive_types_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 = { @@ -11957,7 +11956,7 @@ def delete_sensitive_types_export(self, sensitive_types_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'), @@ -12041,7 +12040,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}") @@ -12050,10 +12049,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 = { @@ -12062,7 +12061,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'), @@ -12146,7 +12145,7 @@ def delete_sql_firewall_allowed_sql(self, sql_firewall_allowed_sql_id, **kwargs) "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_allowed_sql got unknown kwargs: {extra_kwargs!r}") @@ -12155,10 +12154,10 @@ def delete_sql_firewall_allowed_sql(self, sql_firewall_allowed_sql_id, **kwargs) "sqlFirewallAllowedSqlId": sql_firewall_allowed_sql_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12167,7 +12166,7 @@ def delete_sql_firewall_allowed_sql(self, sql_firewall_allowed_sql_id, **kwargs) "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12251,7 +12250,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}") @@ -12260,10 +12259,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 = { @@ -12272,7 +12271,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'), @@ -12356,7 +12355,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}") @@ -12365,10 +12364,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 = { @@ -12377,7 +12376,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'), @@ -12461,7 +12460,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}") @@ -12470,10 +12469,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 = { @@ -12482,7 +12481,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'), @@ -12566,7 +12565,7 @@ def delete_target_database_group(self, target_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_target_database_group got unknown kwargs: {extra_kwargs!r}") @@ -12575,10 +12574,10 @@ def delete_target_database_group(self, target_database_group_id, **kwargs): "targetDatabaseGroupId": target_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 = { @@ -12587,7 +12586,7 @@ def delete_target_database_group(self, target_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'), @@ -12671,7 +12670,7 @@ def delete_unified_audit_policy(self, unified_audit_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_unified_audit_policy got unknown kwargs: {extra_kwargs!r}") @@ -12680,10 +12679,10 @@ def delete_unified_audit_policy(self, unified_audit_policy_id, **kwargs): "unifiedAuditPolicyId": unified_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 = { @@ -12692,7 +12691,7 @@ def delete_unified_audit_policy(self, unified_audit_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'), @@ -12776,7 +12775,7 @@ def delete_unified_audit_policy_definition(self, unified_audit_policy_definition "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_audit_policy_definition got unknown kwargs: {extra_kwargs!r}") @@ -12785,10 +12784,10 @@ def delete_unified_audit_policy_definition(self, unified_audit_policy_definition "unifiedAuditPolicyDefinitionId": unified_audit_policy_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 = { @@ -12797,7 +12796,7 @@ def delete_unified_audit_policy_definition(self, unified_audit_policy_definition "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -12884,7 +12883,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}") @@ -12893,10 +12892,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 = { @@ -12905,7 +12904,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'), @@ -12996,7 +12995,7 @@ def deploy_security_policy_deployment(self, security_policy_deployment_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"deploy_security_policy_deployment got unknown kwargs: {extra_kwargs!r}") @@ -13005,10 +13004,10 @@ def deploy_security_policy_deployment(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') header_params = { @@ -13018,7 +13017,7 @@ def deploy_security_policy_deployment(self, security_policy_deployment_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'), @@ -13113,7 +13112,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}") @@ -13122,10 +13121,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 = { @@ -13135,7 +13134,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'), @@ -13218,7 +13217,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}") @@ -13227,10 +13226,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 = { @@ -13238,7 +13237,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'), @@ -13321,7 +13320,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}") @@ -13330,10 +13329,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 = { @@ -13341,7 +13340,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'), @@ -13427,7 +13426,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}") @@ -13436,10 +13435,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 = { @@ -13447,7 +13446,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'), @@ -13532,7 +13531,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}") @@ -13541,10 +13540,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 = { @@ -13552,7 +13551,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'), @@ -13644,7 +13643,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}") @@ -13656,7 +13655,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'), @@ -13752,7 +13751,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}") @@ -13761,10 +13760,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 = { @@ -13774,7 +13773,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'), @@ -13861,7 +13860,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}") @@ -13870,10 +13869,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 = { @@ -13881,7 +13880,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'), @@ -13966,7 +13965,7 @@ def download_sensitive_types_export(self, sensitive_types_export_id, download_se "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_types_export got unknown kwargs: {extra_kwargs!r}") @@ -13975,10 +13974,10 @@ def download_sensitive_types_export(self, sensitive_types_export_id, download_se "sensitiveTypesExportId": sensitive_types_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 = { @@ -13986,7 +13985,7 @@ def download_sensitive_types_export(self, sensitive_types_export_id, download_se "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14085,7 +14084,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}") @@ -14094,10 +14093,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 = { @@ -14107,7 +14106,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'), @@ -14200,7 +14199,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}") @@ -14208,7 +14207,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", @@ -14216,7 +14215,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'), @@ -14300,7 +14299,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}") @@ -14309,10 +14308,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 = { @@ -14320,7 +14319,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'), @@ -14408,7 +14407,7 @@ def generate_health_report(self, masking_policy_id, generate_health_report_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"generate_health_report got unknown kwargs: {extra_kwargs!r}") @@ -14417,10 +14416,10 @@ def generate_health_report(self, masking_policy_id, generate_health_report_detai "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 = { @@ -14429,7 +14428,7 @@ def generate_health_report(self, masking_policy_id, generate_health_report_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'), @@ -14515,7 +14514,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}") @@ -14524,10 +14523,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 = { @@ -14535,7 +14534,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'), @@ -14619,7 +14618,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}") @@ -14628,10 +14627,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 = { @@ -14639,7 +14638,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'), @@ -14735,7 +14734,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}") @@ -14744,10 +14743,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 = { @@ -14757,7 +14756,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'), @@ -14868,7 +14867,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}") @@ -14877,16 +14876,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", @@ -14895,7 +14894,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'), @@ -14995,7 +14994,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}") @@ -15004,10 +15003,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 = { @@ -15017,7 +15016,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'), @@ -15102,7 +15101,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}") @@ -15111,10 +15110,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 = { @@ -15122,7 +15121,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'), @@ -15215,7 +15214,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}") @@ -15224,10 +15223,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 = { @@ -15237,7 +15236,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'), @@ -15333,7 +15332,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}") @@ -15342,10 +15341,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 = { @@ -15355,7 +15354,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'), @@ -15434,7 +15433,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}") @@ -15443,10 +15442,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 = { @@ -15454,7 +15453,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'), @@ -15532,7 +15531,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}") @@ -15541,10 +15540,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 = { @@ -15552,7 +15551,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'), @@ -15633,7 +15632,7 @@ def get_alert_policy_rule(self, alert_policy_id, 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_alert_policy_rule got unknown kwargs: {extra_kwargs!r}") @@ -15643,10 +15642,10 @@ def get_alert_policy_rule(self, alert_policy_id, rule_key, **kwargs): "ruleKey": 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 = { @@ -15654,7 +15653,7 @@ def get_alert_policy_rule(self, alert_policy_id, 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'), @@ -15740,7 +15739,7 @@ def get_attribute_set(self, attribute_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"get_attribute_set got unknown kwargs: {extra_kwargs!r}") @@ -15749,10 +15748,10 @@ def get_attribute_set(self, attribute_set_id, **kwargs): "attributeSetId": attribute_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 = { @@ -15761,7 +15760,7 @@ def get_attribute_set(self, attribute_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'), @@ -15847,7 +15846,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}") @@ -15856,10 +15855,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 = { @@ -15868,7 +15867,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'), @@ -15946,7 +15945,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}") @@ -15955,10 +15954,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 = { @@ -15966,7 +15965,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'), @@ -16044,7 +16043,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}") @@ -16053,10 +16052,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 = { @@ -16064,7 +16063,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'), @@ -16142,7 +16141,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}") @@ -16151,10 +16150,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 = { @@ -16162,7 +16161,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'), @@ -16255,7 +16254,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}") @@ -16264,14 +16263,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'), @@ -16378,7 +16377,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}") @@ -16397,14 +16396,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'), @@ -16483,7 +16482,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}") @@ -16491,14 +16490,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'), @@ -16576,7 +16575,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}") @@ -16585,10 +16584,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 = { @@ -16596,7 +16595,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'), @@ -16674,7 +16673,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}") @@ -16683,10 +16682,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 = { @@ -16694,7 +16693,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'), @@ -16775,7 +16774,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}") @@ -16785,10 +16784,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 = { @@ -16796,7 +16795,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'), @@ -16877,7 +16876,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}") @@ -16887,10 +16886,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 = { @@ -16898,7 +16897,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'), @@ -16979,7 +16978,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}") @@ -16989,10 +16988,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 = { @@ -17000,7 +16999,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'), @@ -17078,7 +17077,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}") @@ -17087,10 +17086,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 = { @@ -17098,7 +17097,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'), @@ -17179,7 +17178,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}") @@ -17189,10 +17188,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 = { @@ -17200,7 +17199,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'), @@ -17294,7 +17293,7 @@ def get_group_members(self, target_database_group_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_group_members got unknown kwargs: {extra_kwargs!r}") @@ -17303,10 +17302,10 @@ def get_group_members(self, target_database_group_id, **kwargs): "targetDatabaseGroupId": target_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') query_params = { @@ -17314,14 +17313,14 @@ def get_group_members(self, target_database_group_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'), @@ -17401,7 +17400,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}") @@ -17410,10 +17409,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 = { @@ -17421,7 +17420,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'), @@ -17502,7 +17501,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}") @@ -17512,10 +17511,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 = { @@ -17523,7 +17522,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'), @@ -17601,7 +17600,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}") @@ -17610,10 +17609,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 = { @@ -17621,7 +17620,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'), @@ -17699,7 +17698,7 @@ def get_masking_policy_health_report(self, masking_policy_health_report_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_masking_policy_health_report got unknown kwargs: {extra_kwargs!r}") @@ -17708,10 +17707,10 @@ def get_masking_policy_health_report(self, masking_policy_health_report_id, **kw "maskingPolicyHealthReportId": masking_policy_health_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 = { @@ -17719,7 +17718,7 @@ def get_masking_policy_health_report(self, masking_policy_health_report_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'), @@ -17797,7 +17796,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}") @@ -17806,10 +17805,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 = { @@ -17817,7 +17816,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'), @@ -17895,7 +17894,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}") @@ -17904,10 +17903,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 = { @@ -17915,7 +17914,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'), @@ -17996,7 +17995,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}") @@ -18006,10 +18005,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 = { @@ -18017,7 +18016,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'), @@ -18101,7 +18100,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}") @@ -18111,10 +18110,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 = { @@ -18122,7 +18121,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'), @@ -18203,7 +18202,7 @@ def get_referential_relation(self, sensitive_data_model_id, referential_relation "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_referential_relation got unknown kwargs: {extra_kwargs!r}") @@ -18213,10 +18212,10 @@ def get_referential_relation(self, sensitive_data_model_id, referential_relation "referentialRelationKey": referential_relation_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 = { @@ -18224,7 +18223,7 @@ def get_referential_relation(self, sensitive_data_model_id, referential_relation "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18302,7 +18301,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}") @@ -18311,10 +18310,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 = { @@ -18322,7 +18321,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'), @@ -18400,7 +18399,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}") @@ -18409,10 +18408,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 = { @@ -18420,7 +18419,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'), @@ -18498,7 +18497,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}") @@ -18507,10 +18506,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 = { @@ -18518,7 +18517,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'), @@ -18596,7 +18595,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}") @@ -18605,10 +18604,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 = { @@ -18616,7 +18615,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'), @@ -18694,7 +18693,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}") @@ -18703,10 +18702,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 = { @@ -18714,7 +18713,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'), @@ -18795,7 +18794,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}") @@ -18805,10 +18804,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 = { @@ -18816,7 +18815,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'), @@ -18894,7 +18893,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}") @@ -18903,10 +18902,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 = { @@ -18914,7 +18913,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'), @@ -18992,7 +18991,7 @@ def get_security_policy_config(self, security_policy_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_security_policy_config got unknown kwargs: {extra_kwargs!r}") @@ -19001,10 +19000,10 @@ def get_security_policy_config(self, security_policy_config_id, **kwargs): "securityPolicyConfigId": security_policy_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 = { @@ -19012,7 +19011,7 @@ def get_security_policy_config(self, security_policy_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'), @@ -19090,7 +19089,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}") @@ -19099,10 +19098,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 = { @@ -19110,7 +19109,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'), @@ -19194,7 +19193,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}") @@ -19204,10 +19203,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 = { @@ -19215,7 +19214,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'), @@ -19293,7 +19292,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}") @@ -19302,10 +19301,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 = { @@ -19313,7 +19312,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'), @@ -19394,7 +19393,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}") @@ -19404,10 +19403,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 = { @@ -19415,7 +19414,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'), @@ -19493,7 +19492,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}") @@ -19502,10 +19501,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 = { @@ -19513,7 +19512,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'), @@ -19591,7 +19590,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}") @@ -19600,10 +19599,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 = { @@ -19611,7 +19610,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'), @@ -19689,7 +19688,7 @@ def get_sensitive_type_group(self, sensitive_type_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_sensitive_type_group got unknown kwargs: {extra_kwargs!r}") @@ -19698,10 +19697,10 @@ def get_sensitive_type_group(self, sensitive_type_group_id, **kwargs): "sensitiveTypeGroupId": sensitive_type_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 = { @@ -19709,7 +19708,7 @@ def get_sensitive_type_group(self, sensitive_type_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'), @@ -19787,7 +19786,7 @@ def get_sensitive_types_export(self, sensitive_types_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_sensitive_types_export got unknown kwargs: {extra_kwargs!r}") @@ -19796,10 +19795,10 @@ def get_sensitive_types_export(self, sensitive_types_export_id, **kwargs): "sensitiveTypesExportId": sensitive_types_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 = { @@ -19807,7 +19806,7 @@ def get_sensitive_types_export(self, sensitive_types_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'), @@ -19885,7 +19884,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}") @@ -19894,10 +19893,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 = { @@ -19905,7 +19904,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'), @@ -19983,7 +19982,7 @@ def get_sql_firewall_allowed_sql(self, sql_firewall_allowed_sql_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_allowed_sql got unknown kwargs: {extra_kwargs!r}") @@ -19992,10 +19991,10 @@ def get_sql_firewall_allowed_sql(self, sql_firewall_allowed_sql_id, **kwargs): "sqlFirewallAllowedSqlId": sql_firewall_allowed_sql_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -20003,7 +20002,7 @@ def get_sql_firewall_allowed_sql(self, sql_firewall_allowed_sql_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -20081,7 +20080,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}") @@ -20090,10 +20089,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 = { @@ -20101,7 +20100,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'), @@ -20179,7 +20178,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}") @@ -20188,10 +20187,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 = { @@ -20199,7 +20198,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'), @@ -20277,7 +20276,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}") @@ -20286,10 +20285,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 = { @@ -20297,7 +20296,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'), @@ -20375,7 +20374,7 @@ def get_target_database_group(self, target_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_target_database_group got unknown kwargs: {extra_kwargs!r}") @@ -20384,10 +20383,10 @@ def get_target_database_group(self, target_database_group_id, **kwargs): "targetDatabaseGroupId": target_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 = { @@ -20395,7 +20394,7 @@ def get_target_database_group(self, target_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'), @@ -20488,7 +20487,7 @@ def get_template_baseline_comparison(self, security_assessment_id, comparison_se "finding_key", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_baseline_comparison got unknown kwargs: {extra_kwargs!r}") @@ -20498,10 +20497,10 @@ def get_template_baseline_comparison(self, security_assessment_id, comparison_se "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') query_params = { @@ -20509,14 +20508,14 @@ def get_template_baseline_comparison(self, security_assessment_id, comparison_se "category": kwargs.get("category", 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'), @@ -20596,7 +20595,7 @@ def get_unified_audit_policy(self, unified_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_unified_audit_policy got unknown kwargs: {extra_kwargs!r}") @@ -20605,10 +20604,10 @@ def get_unified_audit_policy(self, unified_audit_policy_id, **kwargs): "unifiedAuditPolicyId": unified_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 = { @@ -20616,7 +20615,7 @@ def get_unified_audit_policy(self, unified_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'), @@ -20694,7 +20693,7 @@ def get_unified_audit_policy_definition(self, unified_audit_policy_definition_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_unified_audit_policy_definition got unknown kwargs: {extra_kwargs!r}") @@ -20703,10 +20702,10 @@ def get_unified_audit_policy_definition(self, unified_audit_policy_definition_id "unifiedAuditPolicyDefinitionId": unified_audit_policy_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 = { @@ -20714,7 +20713,7 @@ def get_unified_audit_policy_definition(self, unified_audit_policy_definition_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'), @@ -20792,7 +20791,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}") @@ -20801,10 +20800,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 = { @@ -20812,7 +20811,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'), @@ -20893,7 +20892,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}") @@ -20903,10 +20902,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 = { @@ -20914,7 +20913,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'), @@ -20992,7 +20991,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}") @@ -21001,10 +21000,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 = { @@ -21012,7 +21011,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'), @@ -21201,7 +21200,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}") @@ -21258,7 +21257,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", @@ -21267,7 +21266,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'), @@ -21427,7 +21426,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}") @@ -21483,14 +21482,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'), @@ -21581,7 +21580,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}") @@ -21590,24 +21589,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'), @@ -21762,7 +21761,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}") @@ -21808,14 +21807,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'), @@ -21930,7 +21929,7 @@ def list_associated_resources(self, attribute_set_id, **kwargs): "associated_resource_type", "associated_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_associated_resources got unknown kwargs: {extra_kwargs!r}") @@ -21939,10 +21938,10 @@ def list_associated_resources(self, attribute_set_id, **kwargs): "attributeSetId": attribute_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') if 'associated_resource_type' in kwargs: @@ -21958,7 +21957,7 @@ def list_associated_resources(self, attribute_set_id, **kwargs): "associatedResourceType": kwargs.get("associated_resource_type", missing), "associatedResourceId": kwargs.get("associated_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", @@ -21967,7 +21966,7 @@ def list_associated_resources(self, attribute_set_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'), @@ -22131,7 +22130,7 @@ def list_attribute_sets(self, compartment_id, **kwargs): "is_user_defined", "in_use" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_sets got unknown kwargs: {extra_kwargs!r}") @@ -22193,14 +22192,14 @@ def list_attribute_sets(self, compartment_id, **kwargs): "isUserDefined": kwargs.get("is_user_defined", missing), "inUse": kwargs.get("in_use", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -22344,7 +22343,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}") @@ -22392,14 +22391,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'), @@ -22590,7 +22589,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}") @@ -22647,7 +22646,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", @@ -22656,7 +22655,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'), @@ -22802,7 +22801,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}") @@ -22838,14 +22837,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'), @@ -22999,7 +22998,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}") @@ -23046,14 +23045,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'), @@ -23204,7 +23203,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}") @@ -23251,14 +23250,14 @@ def list_audit_policy_analytics(self, compartment_id, **kwargs): "targetDatabaseGroupId": kwargs.get("target_database_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", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23386,7 +23385,7 @@ def list_audit_profile_analytics(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_audit_profile_analytics got unknown kwargs: {extra_kwargs!r}") @@ -23422,14 +23421,14 @@ def list_audit_profile_analytics(self, compartment_id, **kwargs): "groupBy": self.base_client.generate_collection_format_param(kwargs.get("group_by", missing), 'multi'), "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'), @@ -23604,7 +23603,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}") @@ -23662,14 +23661,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'), @@ -23817,7 +23816,7 @@ def list_audit_trail_analytics(self, compartment_id, **kwargs): "target_database_group_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}") @@ -23850,14 +23849,14 @@ def list_audit_trail_analytics(self, compartment_id, **kwargs): "queryTimeZone": kwargs.get("query_time_zone", missing), "targetDatabaseGroupId": kwargs.get("target_database_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'), @@ -24016,7 +24015,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}") @@ -24071,14 +24070,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'), @@ -24209,7 +24208,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}") @@ -24218,10 +24217,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: @@ -24248,14 +24247,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'), @@ -24396,7 +24395,7 @@ def list_checks(self, security_assessment_id, **kwargs): "access_level", "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_checks got unknown kwargs: {extra_kwargs!r}") @@ -24405,10 +24404,10 @@ def list_checks(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 'sort_order' in kwargs: @@ -24467,14 +24466,14 @@ def list_checks(self, security_assessment_id, **kwargs): "accessLevel": kwargs.get("access_level", missing), "key": kwargs.get("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'), @@ -24603,7 +24602,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}") @@ -24612,10 +24611,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: @@ -24641,14 +24640,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'), @@ -24780,7 +24779,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}") @@ -24789,10 +24788,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: @@ -24822,14 +24821,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'), @@ -24963,7 +24962,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}") @@ -25008,14 +25007,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'), @@ -25187,7 +25186,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}") @@ -25236,14 +25235,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'), @@ -25359,7 +25358,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}") @@ -25368,10 +25367,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: @@ -25395,14 +25394,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'), @@ -25524,7 +25523,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}") @@ -25533,10 +25532,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: @@ -25561,14 +25560,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'), @@ -25703,7 +25702,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}") @@ -25712,10 +25711,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: @@ -25765,14 +25764,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'), @@ -25914,7 +25913,7 @@ def list_discovery_analytics(self, compartment_id, **kwargs): "is_common", "sensitive_type_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_discovery_analytics got unknown kwargs: {extra_kwargs!r}") @@ -25955,14 +25954,14 @@ def list_discovery_analytics(self, compartment_id, **kwargs): "isCommon": kwargs.get("is_common", missing), "sensitiveTypeGroupId": kwargs.get("sensitive_type_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'), @@ -26101,7 +26100,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}") @@ -26110,10 +26109,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: @@ -26165,14 +26164,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'), @@ -26313,7 +26312,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}") @@ -26360,14 +26359,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'), @@ -26550,7 +26549,7 @@ def list_finding_analytics(self, compartment_id, **kwargs): "contains_severity", "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_finding_analytics got unknown kwargs: {extra_kwargs!r}") @@ -26617,14 +26616,14 @@ def list_finding_analytics(self, compartment_id, **kwargs): "containsSeverity": self.base_client.generate_collection_format_param(kwargs.get("contains_severity", missing), 'multi'), "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", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -26829,7 +26828,7 @@ def list_findings(self, security_assessment_id, **kwargs): "sort_order", "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}") @@ -26838,10 +26837,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: @@ -26931,14 +26930,14 @@ def list_findings(self, security_assessment_id, **kwargs): "sortOrder": kwargs.get("sort_order", 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'), @@ -27102,7 +27101,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}") @@ -27111,10 +27110,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: @@ -27153,14 +27152,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'), @@ -27298,7 +27297,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}") @@ -27308,10 +27307,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: @@ -27341,14 +27340,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'), @@ -27444,7 +27443,7 @@ def list_grouped_sensitive_types(self, sensitive_type_group_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_grouped_sensitive_types got unknown kwargs: {extra_kwargs!r}") @@ -27453,10 +27452,10 @@ def list_grouped_sensitive_types(self, sensitive_type_group_id, **kwargs): "sensitiveTypeGroupId": sensitive_type_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 = { @@ -27464,14 +27463,14 @@ def list_grouped_sensitive_types(self, sensitive_type_group_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'), @@ -27629,7 +27628,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}") @@ -27684,14 +27683,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'), @@ -27819,7 +27818,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}") @@ -27828,10 +27827,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: @@ -27868,14 +27867,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'), @@ -28008,7 +28007,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}") @@ -28047,14 +28046,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'), @@ -28242,7 +28241,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}") @@ -28251,10 +28250,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: @@ -28314,14 +28313,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'), @@ -28431,7 +28430,7 @@ def list_masking_errors(self, masking_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_masking_errors got unknown kwargs: {extra_kwargs!r}") @@ -28440,10 +28439,10 @@ def list_masking_errors(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 'step_name' in kwargs: @@ -28474,14 +28473,14 @@ def list_masking_errors(self, masking_report_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'), @@ -28600,7 +28599,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}") @@ -28609,10 +28608,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: @@ -28646,14 +28645,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'), @@ -28813,7 +28812,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}") @@ -28862,14 +28861,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'), @@ -28977,7 +28976,7 @@ def list_masking_policy_health_report_logs(self, masking_policy_health_report_id "sort_by", "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"list_masking_policy_health_report_logs got unknown kwargs: {extra_kwargs!r}") @@ -28986,10 +28985,10 @@ def list_masking_policy_health_report_logs(self, masking_policy_health_report_id "maskingPolicyHealthReportId": masking_policy_health_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: @@ -29020,14 +29019,14 @@ def list_masking_policy_health_report_logs(self, masking_policy_health_report_id "sortBy": kwargs.get("sort_by", missing), "messageType": kwargs.get("message_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'), @@ -29167,7 +29166,7 @@ def list_masking_policy_health_reports(self, compartment_id, **kwargs): "masking_policy_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_masking_policy_health_reports got unknown kwargs: {extra_kwargs!r}") @@ -29214,14 +29213,14 @@ def list_masking_policy_health_reports(self, compartment_id, **kwargs): "maskingPolicyId": kwargs.get("masking_policy_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'), @@ -29345,7 +29344,7 @@ def list_masking_policy_referential_relations(self, masking_policy_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_masking_policy_referential_relations got unknown kwargs: {extra_kwargs!r}") @@ -29354,10 +29353,10 @@ def list_masking_policy_referential_relations(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 'relation_type' in kwargs: @@ -29392,14 +29391,14 @@ def list_masking_policy_referential_relations(self, masking_policy_id, **kwargs) "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -29529,7 +29528,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}") @@ -29567,14 +29566,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'), @@ -29681,7 +29680,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}") @@ -29690,10 +29689,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: @@ -29717,14 +29716,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'), @@ -29858,7 +29857,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}") @@ -29903,14 +29902,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'), @@ -30023,7 +30022,7 @@ def list_password_expiry_date_analytics(self, user_assessment_id, **kwargs): "time_password_expiry_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_password_expiry_date_analytics got unknown kwargs: {extra_kwargs!r}") @@ -30032,10 +30031,10 @@ def list_password_expiry_date_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: @@ -30051,14 +30050,14 @@ def list_password_expiry_date_analytics(self, user_assessment_id, **kwargs): "userCategory": kwargs.get("user_category", missing), "timePasswordExpiryLessThan": kwargs.get("time_password_expiry_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'), @@ -30165,7 +30164,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}") @@ -30174,17 +30173,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", @@ -30193,7 +30192,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'), @@ -30339,7 +30338,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}") @@ -30348,10 +30347,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: @@ -30386,14 +30385,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'), @@ -30592,7 +30591,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}") @@ -30601,10 +30600,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: @@ -30651,14 +30650,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'), @@ -30789,7 +30788,7 @@ def list_referential_relations(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_referential_relations got unknown kwargs: {extra_kwargs!r}") @@ -30798,10 +30797,10 @@ def list_referential_relations(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 'relation_type' in kwargs: @@ -30837,14 +30836,14 @@ def list_referential_relations(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'), @@ -30992,7 +30991,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}") @@ -31053,14 +31052,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'), @@ -31227,7 +31226,7 @@ def list_reports(self, compartment_id, **kwargs): "type", "data_source" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -31298,14 +31297,14 @@ def list_reports(self, compartment_id, **kwargs): "type": kwargs.get("type", missing), "dataSource": kwargs.get("data_source", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -31403,7 +31402,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}") @@ -31412,10 +31411,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 = { @@ -31424,14 +31423,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'), @@ -31551,7 +31550,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}") @@ -31560,10 +31559,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: @@ -31590,14 +31589,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'), @@ -31713,7 +31712,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}") @@ -31722,10 +31721,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: @@ -31751,14 +31750,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'), @@ -31895,7 +31894,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}") @@ -31941,14 +31940,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'), @@ -32149,7 +32148,7 @@ def list_security_assessments(self, compartment_id, **kwargs): "target_database_group_id", "template_assessment_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -32225,14 +32224,14 @@ def list_security_assessments(self, compartment_id, **kwargs): "targetDatabaseGroupId": kwargs.get("target_database_group_id", missing), "templateAssessmentId": kwargs.get("template_assessment_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'), @@ -32339,7 +32338,7 @@ def list_security_feature_analytics(self, compartment_id, **kwargs): "opc_request_id", "target_database_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_security_feature_analytics got unknown kwargs: {extra_kwargs!r}") @@ -32358,14 +32357,14 @@ def list_security_feature_analytics(self, compartment_id, **kwargs): "targetId": kwargs.get("target_id", missing), "targetDatabaseGroupId": kwargs.get("target_database_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'), @@ -32543,7 +32542,7 @@ def list_security_features(self, compartment_id, **kwargs): "page", "target_database_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_security_features got unknown kwargs: {extra_kwargs!r}") @@ -32652,14 +32651,14 @@ def list_security_features(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "targetDatabaseGroupId": kwargs.get("target_database_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'), @@ -32810,7 +32809,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}") @@ -32863,14 +32862,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'), @@ -33038,7 +33037,7 @@ def list_security_policy_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_security_policy_configs got unknown kwargs: {extra_kwargs!r}") @@ -33086,14 +33085,14 @@ def list_security_policy_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'), @@ -33252,7 +33251,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}") @@ -33307,14 +33306,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'), @@ -33426,7 +33425,7 @@ def list_security_policy_entry_states(self, security_policy_deployment_id, **kwa "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_policy_entry_states got unknown kwargs: {extra_kwargs!r}") @@ -33435,10 +33434,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: @@ -33463,14 +33462,14 @@ def list_security_policy_entry_states(self, security_policy_deployment_id, **kwa "securityPolicyEntryType": kwargs.get("security_policy_entry_type", 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'), @@ -33621,7 +33620,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}") @@ -33667,14 +33666,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'), @@ -33825,7 +33824,7 @@ def list_sensitive_column_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_sensitive_column_analytics got unknown kwargs: {extra_kwargs!r}") @@ -33861,14 +33860,14 @@ def list_sensitive_column_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'), @@ -34082,7 +34081,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}") @@ -34091,10 +34090,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: @@ -34181,14 +34180,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'), @@ -34297,7 +34296,7 @@ def list_sensitive_data_model_sensitive_types(self, sensitive_data_model_id, **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"list_sensitive_data_model_sensitive_types got unknown kwargs: {extra_kwargs!r}") @@ -34306,10 +34305,10 @@ def list_sensitive_data_model_sensitive_types(self, sensitive_data_model_id, **k "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_by' in kwargs: @@ -34333,14 +34332,14 @@ def list_sensitive_data_model_sensitive_types(self, sensitive_data_model_id, **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'), @@ -34496,7 +34495,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}") @@ -34544,14 +34543,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'), @@ -34668,7 +34667,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}") @@ -34677,10 +34676,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: @@ -34714,14 +34713,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'), @@ -34830,7 +34829,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}") @@ -34839,10 +34838,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: @@ -34866,14 +34865,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'), @@ -35025,7 +35024,7 @@ def list_sensitive_type_groups(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_sensitive_type_groups got unknown kwargs: {extra_kwargs!r}") @@ -35072,14 +35071,14 @@ def list_sensitive_type_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'), @@ -35254,7 +35253,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}") @@ -35320,14 +35319,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'), @@ -35479,7 +35478,7 @@ def list_sensitive_types_exports(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_sensitive_types_exports got unknown kwargs: {extra_kwargs!r}") @@ -35526,14 +35525,14 @@ def list_sensitive_types_exports(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'), @@ -35684,7 +35683,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}") @@ -35724,14 +35723,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'), @@ -35839,7 +35838,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}") @@ -35848,10 +35847,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: @@ -35868,14 +35867,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'), @@ -36052,7 +36051,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}") @@ -36102,14 +36101,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'), @@ -36244,7 +36243,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}") @@ -36273,14 +36272,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'), @@ -36421,7 +36420,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}") @@ -36457,14 +36456,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'), @@ -36642,7 +36641,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}") @@ -36699,14 +36698,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'), @@ -36851,7 +36850,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}") @@ -36890,14 +36889,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'), @@ -37063,7 +37062,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}") @@ -37120,7 +37119,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", @@ -37128,7 +37127,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'), @@ -37257,7 +37256,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}") @@ -37293,14 +37292,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'), @@ -37418,7 +37417,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}") @@ -37427,10 +37426,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: @@ -37457,14 +37456,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'), @@ -37619,7 +37618,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}") @@ -37667,14 +37666,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'), @@ -37834,7 +37833,7 @@ def list_target_database_groups(self, compartment_id, **kwargs): "page", "target_database_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_target_database_groups got unknown kwargs: {extra_kwargs!r}") @@ -37882,14 +37881,14 @@ def list_target_database_groups(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "targetDatabaseGroupId": kwargs.get("target_database_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'), @@ -38037,7 +38036,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}") @@ -38099,14 +38098,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'), @@ -38214,7 +38213,7 @@ def list_target_overrides(self, audit_profile_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_target_overrides got unknown kwargs: {extra_kwargs!r}") @@ -38223,10 +38222,10 @@ def list_target_overrides(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') if 'sort_by' in kwargs: @@ -38250,14 +38249,14 @@ def list_target_overrides(self, audit_profile_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'), @@ -38404,7 +38403,7 @@ def list_template_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_template_analytics got unknown kwargs: {extra_kwargs!r}") @@ -38430,14 +38429,14 @@ def list_template_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'), @@ -38571,7 +38570,7 @@ def list_template_association_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_template_association_analytics got unknown kwargs: {extra_kwargs!r}") @@ -38594,14 +38593,14 @@ def list_template_association_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'), @@ -38777,7 +38776,7 @@ def list_unified_audit_policies(self, compartment_id, **kwargs): "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"list_unified_audit_policies got unknown kwargs: {extra_kwargs!r}") @@ -38827,14 +38826,14 @@ def list_unified_audit_policies(self, compartment_id, **kwargs): "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'), @@ -38993,7 +38992,7 @@ def list_unified_audit_policy_definitions(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_unified_audit_policy_definitions got unknown kwargs: {extra_kwargs!r}") @@ -39048,14 +39047,14 @@ def list_unified_audit_policy_definitions(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'), @@ -39157,7 +39156,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}") @@ -39166,10 +39165,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: @@ -39192,14 +39191,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'), @@ -39414,7 +39413,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}") @@ -39423,10 +39422,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: @@ -39472,14 +39471,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'), @@ -39678,7 +39677,7 @@ def list_user_assessments(self, compartment_id, **kwargs): "target_type", "target_database_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_user_assessments got unknown kwargs: {extra_kwargs!r}") @@ -39753,14 +39752,14 @@ def list_user_assessments(self, compartment_id, **kwargs): "targetType": kwargs.get("target_type", missing), "targetDatabaseGroupId": kwargs.get("target_database_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'), @@ -39988,7 +39987,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}") @@ -39997,10 +39996,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: @@ -40051,14 +40050,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'), @@ -40150,7 +40149,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}") @@ -40159,24 +40158,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'), @@ -40268,7 +40267,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}") @@ -40277,24 +40276,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'), @@ -40425,7 +40424,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}") @@ -40463,14 +40462,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'), @@ -40558,7 +40557,7 @@ def mask_data(self, masking_policy_id, mask_data_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"mask_data got unknown kwargs: {extra_kwargs!r}") @@ -40567,10 +40566,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 = { @@ -40579,7 +40578,7 @@ def mask_data(self, masking_policy_id, mask_data_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'), @@ -40676,7 +40675,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}") @@ -40685,10 +40684,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 = { @@ -40698,7 +40697,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'), @@ -40799,7 +40798,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}") @@ -40815,7 +40814,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", @@ -40823,7 +40822,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'), @@ -40913,7 +40912,7 @@ def patch_checks(self, security_assessment_id, patch_checks_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"patch_checks got unknown kwargs: {extra_kwargs!r}") @@ -40922,10 +40921,10 @@ def patch_checks(self, security_assessment_id, patch_checks_details, **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 = { @@ -40934,7 +40933,7 @@ def patch_checks(self, security_assessment_id, patch_checks_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'), @@ -41024,7 +41023,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}") @@ -41033,10 +41032,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 = { @@ -41045,7 +41044,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'), @@ -41134,7 +41133,7 @@ def patch_findings(self, security_assessment_id, patch_findings_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"patch_findings got unknown kwargs: {extra_kwargs!r}") @@ -41143,10 +41142,10 @@ def patch_findings(self, security_assessment_id, patch_findings_details, **kwarg "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 = { @@ -41155,7 +41154,7 @@ def patch_findings(self, security_assessment_id, patch_findings_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'), @@ -41245,7 +41244,7 @@ def patch_grouped_sensitive_types(self, sensitive_type_group_id, patch_grouped_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"patch_grouped_sensitive_types got unknown kwargs: {extra_kwargs!r}") @@ -41254,10 +41253,10 @@ def patch_grouped_sensitive_types(self, sensitive_type_group_id, patch_grouped_s "sensitiveTypeGroupId": sensitive_type_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 = { @@ -41266,7 +41265,7 @@ def patch_grouped_sensitive_types(self, sensitive_type_group_id, patch_grouped_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'), @@ -41357,7 +41356,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}") @@ -41366,10 +41365,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 = { @@ -41378,7 +41377,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'), @@ -41468,7 +41467,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}") @@ -41477,10 +41476,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 = { @@ -41489,7 +41488,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'), @@ -41580,7 +41579,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}") @@ -41589,10 +41588,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 = { @@ -41601,7 +41600,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'), @@ -41688,7 +41687,7 @@ def patch_sql_firewall_allowed_sql(self, patch_sql_firewall_allowed_sql_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_sql_firewall_allowed_sql got unknown kwargs: {extra_kwargs!r}") @@ -41699,7 +41698,7 @@ def patch_sql_firewall_allowed_sql(self, patch_sql_firewall_allowed_sql_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'), @@ -41783,7 +41782,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}") @@ -41794,7 +41793,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'), @@ -41888,7 +41887,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}") @@ -41897,10 +41896,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 = { @@ -41910,7 +41909,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'), @@ -42004,7 +42003,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}") @@ -42013,10 +42012,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 = { @@ -42026,7 +42025,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'), @@ -42118,7 +42117,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}") @@ -42127,10 +42126,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 = { @@ -42140,7 +42139,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'), @@ -42236,7 +42235,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}") @@ -42245,10 +42244,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 = { @@ -42258,7 +42257,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'), @@ -42352,7 +42351,7 @@ def refresh_security_policy_deployment(self, security_policy_deployment_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"refresh_security_policy_deployment got unknown kwargs: {extra_kwargs!r}") @@ -42361,10 +42360,10 @@ def refresh_security_policy_deployment(self, security_policy_deployment_id, **kw "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 = { @@ -42374,7 +42373,7 @@ def refresh_security_policy_deployment(self, security_policy_deployment_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'), @@ -42466,7 +42465,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}") @@ -42475,10 +42474,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 = { @@ -42488,7 +42487,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'), @@ -42580,7 +42579,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}") @@ -42589,10 +42588,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 = { @@ -42602,7 +42601,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'), @@ -42699,7 +42698,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}") @@ -42708,10 +42707,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 = { @@ -42721,7 +42720,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'), @@ -42815,7 +42814,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}") @@ -42824,10 +42823,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 = { @@ -42837,7 +42836,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'), @@ -42929,7 +42928,7 @@ def remove_security_assessment_template(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"remove_security_assessment_template got unknown kwargs: {extra_kwargs!r}") @@ -42938,10 +42937,10 @@ def remove_security_assessment_template(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 = { @@ -42951,7 +42950,7 @@ def remove_security_assessment_template(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'), @@ -43036,7 +43035,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}") @@ -43045,10 +43044,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 = { @@ -43057,7 +43056,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'), @@ -43148,7 +43147,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}") @@ -43157,10 +43156,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 = { @@ -43170,7 +43169,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'), @@ -43262,7 +43261,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}") @@ -43271,10 +43270,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 = { @@ -43284,7 +43283,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'), @@ -43379,7 +43378,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}") @@ -43388,10 +43387,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 = { @@ -43401,7 +43400,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'), @@ -43499,7 +43498,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}") @@ -43508,10 +43507,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 = { @@ -43521,7 +43520,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'), @@ -43619,7 +43618,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}") @@ -43628,10 +43627,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 = { @@ -43641,7 +43640,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'), @@ -43738,7 +43737,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}") @@ -43747,10 +43746,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 = { @@ -43760,7 +43759,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'), @@ -43854,7 +43853,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}") @@ -43863,10 +43862,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 = { @@ -43876,7 +43875,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'), @@ -43961,7 +43960,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}") @@ -43970,10 +43969,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 = { @@ -43982,7 +43981,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'), @@ -44073,7 +44072,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}") @@ -44082,10 +44081,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 = { @@ -44095,7 +44094,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'), @@ -44187,7 +44186,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}") @@ -44196,10 +44195,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 = { @@ -44209,7 +44208,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'), @@ -44307,7 +44306,7 @@ def unset_security_assessment_baseline(self, security_assessment_id, **kwargs): "opc_request_id", "unset_security_assessment_baseline_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"unset_security_assessment_baseline got unknown kwargs: {extra_kwargs!r}") @@ -44316,10 +44315,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 = { @@ -44329,7 +44328,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'), @@ -44429,7 +44428,7 @@ def unset_user_assessment_baseline(self, user_assessment_id, **kwargs): "opc_request_id", "unset_user_assessment_baseline_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"unset_user_assessment_baseline got unknown kwargs: {extra_kwargs!r}") @@ -44438,10 +44437,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 = { @@ -44451,7 +44450,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'), @@ -44541,7 +44540,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}") @@ -44550,10 +44549,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 = { @@ -44562,7 +44561,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'), @@ -44653,7 +44652,7 @@ def update_alert_policy(self, alert_policy_id, update_alert_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_alert_policy got unknown kwargs: {extra_kwargs!r}") @@ -44662,10 +44661,10 @@ def update_alert_policy(self, alert_policy_id, update_alert_policy_details, **kw "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 = { @@ -44674,7 +44673,7 @@ def update_alert_policy(self, alert_policy_id, update_alert_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'), @@ -44766,7 +44765,7 @@ def update_alert_policy_rule(self, alert_policy_id, rule_key, update_alert_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_alert_policy_rule got unknown kwargs: {extra_kwargs!r}") @@ -44776,10 +44775,10 @@ def update_alert_policy_rule(self, alert_policy_id, rule_key, update_alert_polic "ruleKey": 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 = { @@ -44788,7 +44787,7 @@ def update_alert_policy_rule(self, alert_policy_id, rule_key, update_alert_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'), @@ -44877,7 +44876,7 @@ def update_attribute_set(self, attribute_set_id, update_attribute_set_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_attribute_set got unknown kwargs: {extra_kwargs!r}") @@ -44886,10 +44885,10 @@ def update_attribute_set(self, attribute_set_id, update_attribute_set_details, * "attributeSetId": attribute_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 = { @@ -44898,7 +44897,7 @@ def update_attribute_set(self, attribute_set_id, update_attribute_set_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'), @@ -44987,7 +44986,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}") @@ -44996,10 +44995,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 = { @@ -45008,7 +45007,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'), @@ -45097,7 +45096,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}") @@ -45106,10 +45105,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 = { @@ -45118,7 +45117,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'), @@ -45207,7 +45206,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}") @@ -45216,10 +45215,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 = { @@ -45228,7 +45227,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'), @@ -45317,7 +45316,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}") @@ -45326,10 +45325,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 = { @@ -45338,7 +45337,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'), @@ -45427,7 +45426,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}") @@ -45436,10 +45435,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 = { @@ -45448,7 +45447,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'), @@ -45537,7 +45536,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}") @@ -45546,10 +45545,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 = { @@ -45558,7 +45557,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'), @@ -45657,7 +45656,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}") @@ -45667,10 +45666,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 = { @@ -45680,7 +45679,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'), @@ -45770,7 +45769,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}") @@ -45779,10 +45778,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 = { @@ -45791,7 +45790,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'), @@ -45884,7 +45883,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}") @@ -45894,10 +45893,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 = { @@ -45906,7 +45905,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'), @@ -45995,7 +45994,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}") @@ -46004,10 +46003,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 = { @@ -46016,7 +46015,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'), @@ -46105,7 +46104,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}") @@ -46114,10 +46113,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 = { @@ -46126,7 +46125,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'), @@ -46222,7 +46221,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}") @@ -46231,10 +46230,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 = { @@ -46244,7 +46243,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'), @@ -46344,7 +46343,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}") @@ -46354,10 +46353,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 = { @@ -46367,7 +46366,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'), @@ -46464,7 +46463,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}") @@ -46473,10 +46472,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 = { @@ -46486,7 +46485,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'), @@ -46583,7 +46582,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}") @@ -46592,10 +46591,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 = { @@ -46605,7 +46604,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'), @@ -46695,7 +46694,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}") @@ -46704,10 +46703,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 = { @@ -46716,7 +46715,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'), @@ -46805,7 +46804,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}") @@ -46814,10 +46813,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 = { @@ -46826,7 +46825,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'), @@ -46915,7 +46914,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}") @@ -46924,10 +46923,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 = { @@ -46936,7 +46935,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'), @@ -47025,7 +47024,7 @@ def update_security_policy_config(self, security_policy_config_id, update_securi "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_config got unknown kwargs: {extra_kwargs!r}") @@ -47034,10 +47033,10 @@ def update_security_policy_config(self, security_policy_config_id, update_securi "securityPolicyConfigId": security_policy_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 = { @@ -47046,7 +47045,7 @@ def update_security_policy_config(self, security_policy_config_id, update_securi "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -47135,7 +47134,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}") @@ -47144,10 +47143,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 = { @@ -47156,7 +47155,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'), @@ -47248,7 +47247,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}") @@ -47258,10 +47257,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 = { @@ -47270,7 +47269,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'), @@ -47360,7 +47359,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}") @@ -47369,10 +47368,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 = { @@ -47381,7 +47380,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'), @@ -47470,7 +47469,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}") @@ -47479,10 +47478,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 = { @@ -47491,7 +47490,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'), @@ -47580,7 +47579,7 @@ def update_sensitive_type_group(self, sensitive_type_group_id, update_sensitive_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_group got unknown kwargs: {extra_kwargs!r}") @@ -47589,10 +47588,10 @@ def update_sensitive_type_group(self, sensitive_type_group_id, update_sensitive_ "sensitiveTypeGroupId": sensitive_type_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 = { @@ -47601,7 +47600,7 @@ def update_sensitive_type_group(self, sensitive_type_group_id, update_sensitive_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -47690,7 +47689,7 @@ def update_sensitive_types_export(self, sensitive_types_export_id, update_sensit "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_types_export got unknown kwargs: {extra_kwargs!r}") @@ -47699,10 +47698,10 @@ def update_sensitive_types_export(self, sensitive_types_export_id, update_sensit "sensitiveTypesExportId": sensitive_types_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 = { @@ -47711,7 +47710,7 @@ def update_sensitive_types_export(self, sensitive_types_export_id, update_sensit "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -47800,7 +47799,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}") @@ -47809,10 +47808,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 = { @@ -47821,7 +47820,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'), @@ -47910,7 +47909,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}") @@ -47919,10 +47918,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 = { @@ -47931,7 +47930,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'), @@ -48020,7 +48019,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}") @@ -48029,10 +48028,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 = { @@ -48041,7 +48040,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'), @@ -48137,7 +48136,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}") @@ -48146,10 +48145,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 = { @@ -48159,7 +48158,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'), @@ -48256,7 +48255,7 @@ def update_target_database_group(self, target_database_group_id, update_target_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"update_target_database_group got unknown kwargs: {extra_kwargs!r}") @@ -48265,10 +48264,10 @@ def update_target_database_group(self, target_database_group_id, update_target_d "targetDatabaseGroupId": target_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 = { @@ -48278,7 +48277,7 @@ def update_target_database_group(self, target_database_group_id, update_target_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'), @@ -48368,7 +48367,7 @@ def update_unified_audit_policy(self, unified_audit_policy_id, update_unified_au "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_audit_policy got unknown kwargs: {extra_kwargs!r}") @@ -48377,10 +48376,10 @@ def update_unified_audit_policy(self, unified_audit_policy_id, update_unified_au "unifiedAuditPolicyId": unified_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 = { @@ -48389,7 +48388,7 @@ def update_unified_audit_policy(self, unified_audit_policy_id, update_unified_au "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -48478,7 +48477,7 @@ def update_unified_audit_policy_definition(self, unified_audit_policy_definition "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_audit_policy_definition got unknown kwargs: {extra_kwargs!r}") @@ -48487,10 +48486,10 @@ def update_unified_audit_policy_definition(self, unified_audit_policy_definition "unifiedAuditPolicyDefinitionId": unified_audit_policy_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 = { @@ -48499,7 +48498,7 @@ def update_unified_audit_policy_definition(self, unified_audit_policy_definition "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -48588,7 +48587,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}") @@ -48597,10 +48596,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 = { @@ -48609,7 +48608,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'), @@ -48710,7 +48709,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}") @@ -48719,10 +48718,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 = { @@ -48730,7 +48729,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: @@ -48739,7 +48738,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.') @@ -48851,7 +48850,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}") @@ -48860,10 +48859,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 = { @@ -48871,7 +48870,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: @@ -48880,7 +48879,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 16892359e0..4cd687ea92 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 @@ -171,7 +170,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}") @@ -180,10 +179,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 = { @@ -192,7 +191,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'), @@ -280,7 +279,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}") @@ -289,10 +288,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 = { @@ -301,7 +300,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'), @@ -385,7 +384,7 @@ def activate_model_group(self, model_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"activate_model_group got unknown kwargs: {extra_kwargs!r}") @@ -394,10 +393,10 @@ def activate_model_group(self, model_group_id, **kwargs): "modelGroupId": model_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 = { @@ -406,7 +405,7 @@ def activate_model_group(self, model_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'), @@ -494,7 +493,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}") @@ -503,10 +502,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 = { @@ -515,7 +514,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'), @@ -601,7 +600,7 @@ def activate_schedule(self, schedule_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"activate_schedule got unknown kwargs: {extra_kwargs!r}") @@ -610,10 +609,10 @@ def activate_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 = { @@ -623,7 +622,7 @@ def activate_schedule(self, schedule_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'), @@ -710,7 +709,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}") @@ -719,10 +718,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 = { @@ -731,7 +730,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'), @@ -825,7 +824,7 @@ def cancel_pipeline_run(self, pipeline_run_id, **kwargs): "if_match", "terminate_gracefully" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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}") @@ -834,16 +833,16 @@ 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') query_params = { "terminateGracefully": kwargs.get("terminate_gracefully", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -852,7 +851,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'), @@ -941,7 +940,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}") @@ -950,10 +949,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 = { @@ -962,7 +961,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'), @@ -1051,7 +1050,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}") @@ -1060,10 +1059,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 = { @@ -1073,7 +1072,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'), @@ -1165,7 +1164,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}") @@ -1174,10 +1173,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 = { @@ -1186,7 +1185,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'), @@ -1275,7 +1274,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}") @@ -1284,10 +1283,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 = { @@ -1296,7 +1295,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'), @@ -1387,7 +1386,7 @@ def change_ml_application_compartment(self, ml_application_id, change_ml_applica "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_ml_application_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1396,10 +1395,10 @@ def change_ml_application_compartment(self, ml_application_id, change_ml_applica "mlApplicationId": ml_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 = { @@ -1409,7 +1408,7 @@ def change_ml_application_compartment(self, ml_application_id, change_ml_applica "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 change_ml_application_implementation_compartment(self, ml_application_implem "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_ml_application_implementation_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1512,10 +1511,10 @@ def change_ml_application_implementation_compartment(self, ml_application_implem "mlApplicationImplementationId": ml_application_implementation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 change_ml_application_implementation_compartment(self, ml_application_implem "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 change_ml_application_instance_compartment(self, ml_application_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_ml_application_instance_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1628,10 +1627,10 @@ def change_ml_application_instance_compartment(self, ml_application_instance_id, "mlApplicationInstanceId": ml_application_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 = { @@ -1641,7 +1640,7 @@ def change_ml_application_instance_compartment(self, ml_application_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'), @@ -1735,7 +1734,7 @@ def change_ml_application_instance_view_compartment(self, ml_application_instanc "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_ml_application_instance_view_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1744,10 +1743,10 @@ def change_ml_application_instance_view_compartment(self, ml_application_instanc "mlApplicationInstanceViewId": ml_application_instance_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') header_params = { @@ -1757,7 +1756,7 @@ def change_ml_application_instance_view_compartment(self, ml_application_instanc "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -1862,10 +1861,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 = { @@ -1875,7 +1874,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'), @@ -1969,7 +1968,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}") @@ -1978,10 +1977,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 = { @@ -1991,7 +1990,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'), @@ -2085,7 +2084,7 @@ def change_model_group_compartment(self, model_group_id, change_model_group_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_model_group_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2094,10 +2093,10 @@ def change_model_group_compartment(self, model_group_id, change_model_group_comp "modelGroupId": model_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 = { @@ -2107,7 +2106,7 @@ def change_model_group_compartment(self, model_group_id, change_model_group_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'), @@ -2203,7 +2202,7 @@ def change_model_group_version_history_compartment(self, model_group_version_his "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_group_version_history_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2212,10 +2211,10 @@ def change_model_group_version_history_compartment(self, model_group_version_his "modelGroupVersionHistoryId": model_group_version_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 = { @@ -2225,7 +2224,7 @@ def change_model_group_version_history_compartment(self, model_group_version_his "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -2330,10 +2329,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 = { @@ -2343,7 +2342,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'), @@ -2437,7 +2436,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}") @@ -2446,10 +2445,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 = { @@ -2459,7 +2458,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'), @@ -2549,7 +2548,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}") @@ -2558,10 +2557,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 = { @@ -2570,7 +2569,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'), @@ -2659,7 +2658,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}") @@ -2668,10 +2667,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 = { @@ -2680,7 +2679,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'), @@ -2773,7 +2772,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}") @@ -2782,10 +2781,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 = { @@ -2795,7 +2794,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'), @@ -2887,7 +2886,7 @@ def change_schedule_compartment(self, schedule_id, change_schedule_compartment_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"change_schedule_compartment got unknown kwargs: {extra_kwargs!r}") @@ -2896,10 +2895,10 @@ def change_schedule_compartment(self, schedule_id, change_schedule_compartment_d "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 = { @@ -2909,7 +2908,7 @@ def change_schedule_compartment(self, schedule_id, change_schedule_compartment_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'), @@ -2992,7 +2991,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}") @@ -3003,7 +3002,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'), @@ -3086,7 +3085,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}") @@ -3097,7 +3096,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'), @@ -3202,7 +3201,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}") @@ -3211,10 +3210,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 = { @@ -3224,7 +3223,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: @@ -3233,7 +3232,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.') @@ -3332,7 +3331,7 @@ def create_job_run(self, create_job_run_details, **kwargs): "opc_retry_token", "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_job_run got unknown kwargs: {extra_kwargs!r}") @@ -3344,7 +3343,7 @@ def create_job_run(self, create_job_run_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", 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'), @@ -3427,7 +3426,7 @@ def create_ml_application(self, create_ml_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_ml_application got unknown kwargs: {extra_kwargs!r}") @@ -3438,7 +3437,7 @@ def create_ml_application(self, create_ml_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'), @@ -3521,7 +3520,7 @@ def create_ml_application_implementation(self, create_ml_application_implementat "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_ml_application_implementation got unknown kwargs: {extra_kwargs!r}") @@ -3532,7 +3531,7 @@ def create_ml_application_implementation(self, create_ml_application_implementat "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 create_ml_application_instance(self, create_ml_application_instance_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_ml_application_instance got unknown kwargs: {extra_kwargs!r}") @@ -3626,7 +3625,7 @@ def create_ml_application_instance(self, create_ml_application_instance_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'), @@ -3709,7 +3708,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}") @@ -3720,7 +3719,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'), @@ -3838,7 +3837,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}") @@ -3847,10 +3846,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 = { @@ -3861,7 +3860,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: @@ -3870,7 +3869,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.') @@ -4001,7 +4000,7 @@ def create_model_custom_metadatum_artifact(self, model_id, metadatum_key_name, m "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_custom_metadatum_artifact got unknown kwargs: {extra_kwargs!r}") @@ -4011,10 +4010,10 @@ def create_model_custom_metadatum_artifact(self, model_id, metadatum_key_name, m "metadatumKeyName": metadatum_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 = { @@ -4024,7 +4023,7 @@ def create_model_custom_metadatum_artifact(self, model_id, metadatum_key_name, m "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: @@ -4033,7 +4032,7 @@ def create_model_custom_metadatum_artifact(self, model_id, metadatum_key_name, m model_custom_metadatum_artifact = kwargs.get("model_custom_metadatum_artifact", missing) if model_custom_metadatum_artifact is not missing and model_custom_metadatum_artifact is not None: - if (not isinstance(model_custom_metadatum_artifact, (six.binary_type, six.string_types)) and + if (not isinstance(model_custom_metadatum_artifact, (bytes, str)) and not hasattr(model_custom_metadatum_artifact, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -4161,7 +4160,7 @@ def create_model_defined_metadatum_artifact(self, model_id, metadatum_key_name, "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_defined_metadatum_artifact got unknown kwargs: {extra_kwargs!r}") @@ -4171,10 +4170,10 @@ def create_model_defined_metadatum_artifact(self, model_id, metadatum_key_name, "metadatumKeyName": metadatum_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 = { @@ -4184,7 +4183,7 @@ def create_model_defined_metadatum_artifact(self, model_id, metadatum_key_name, "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: @@ -4193,7 +4192,7 @@ def create_model_defined_metadatum_artifact(self, model_id, metadatum_key_name, model_defined_metadatum_artifact = kwargs.get("model_defined_metadatum_artifact", missing) if model_defined_metadatum_artifact is not missing and model_defined_metadatum_artifact is not None: - if (not isinstance(model_defined_metadatum_artifact, (six.binary_type, six.string_types)) and + if (not isinstance(model_defined_metadatum_artifact, (bytes, str)) and not hasattr(model_defined_metadatum_artifact, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -4291,7 +4290,7 @@ def create_model_deployment(self, create_model_deployment_details, **kwargs): "opc_retry_token", "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_model_deployment got unknown kwargs: {extra_kwargs!r}") @@ -4303,7 +4302,7 @@ def create_model_deployment(self, create_model_deployment_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", 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'), @@ -4386,7 +4385,7 @@ def create_model_group(self, create_base_model_group_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_group got unknown kwargs: {extra_kwargs!r}") @@ -4397,7 +4396,7 @@ def create_model_group(self, create_base_model_group_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'), @@ -4515,7 +4514,7 @@ def create_model_group_artifact(self, model_group_id, model_group_artifact, **kw "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_group_artifact got unknown kwargs: {extra_kwargs!r}") @@ -4524,10 +4523,10 @@ def create_model_group_artifact(self, model_group_id, model_group_artifact, **kw "modelGroupId": model_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 = { @@ -4538,7 +4537,7 @@ def create_model_group_artifact(self, model_group_id, model_group_artifact, **kw "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: @@ -4547,7 +4546,7 @@ def create_model_group_artifact(self, model_group_id, model_group_artifact, **kw model_group_artifact = kwargs.get("model_group_artifact", missing) if model_group_artifact is not missing and model_group_artifact is not None: - if (not isinstance(model_group_artifact, (six.binary_type, six.string_types)) and + if (not isinstance(model_group_artifact, (bytes, str)) and not hasattr(model_group_artifact, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -4644,7 +4643,7 @@ def create_model_group_version_history(self, create_model_group_version_history_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_group_version_history got unknown kwargs: {extra_kwargs!r}") @@ -4655,7 +4654,7 @@ def create_model_group_version_history(self, create_model_group_version_history_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -4752,10 +4751,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 = { @@ -4764,7 +4763,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'), @@ -4849,7 +4848,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}") @@ -4860,7 +4859,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'), @@ -4943,7 +4942,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}") @@ -4954,7 +4953,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'), @@ -5037,7 +5036,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}") @@ -5048,7 +5047,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'), @@ -5135,7 +5134,7 @@ def create_pipeline_run(self, create_pipeline_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_pipeline_run got unknown kwargs: {extra_kwargs!r}") @@ -5147,7 +5146,7 @@ def create_pipeline_run(self, create_pipeline_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'), @@ -5230,7 +5229,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}") @@ -5241,7 +5240,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'), @@ -5324,7 +5323,7 @@ def create_schedule(self, create_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_schedule got unknown kwargs: {extra_kwargs!r}") @@ -5335,7 +5334,7 @@ def create_schedule(self, create_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'), @@ -5448,7 +5447,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}") @@ -5458,10 +5457,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 = { @@ -5471,7 +5470,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: @@ -5480,7 +5479,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.') @@ -5581,7 +5580,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}") @@ -5590,10 +5589,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 = { @@ -5602,7 +5601,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'), @@ -5690,7 +5689,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}") @@ -5699,10 +5698,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 = { @@ -5711,7 +5710,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'), @@ -5795,7 +5794,7 @@ def deactivate_model_group(self, model_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"deactivate_model_group got unknown kwargs: {extra_kwargs!r}") @@ -5804,10 +5803,10 @@ def deactivate_model_group(self, model_group_id, **kwargs): "modelGroupId": model_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 = { @@ -5816,7 +5815,7 @@ def deactivate_model_group(self, model_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'), @@ -5904,7 +5903,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}") @@ -5913,10 +5912,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 = { @@ -5925,7 +5924,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'), @@ -6011,7 +6010,7 @@ def deactivate_schedule(self, schedule_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"deactivate_schedule got unknown kwargs: {extra_kwargs!r}") @@ -6020,10 +6019,10 @@ def deactivate_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 = { @@ -6033,7 +6032,7 @@ def deactivate_schedule(self, schedule_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'), @@ -6118,7 +6117,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}") @@ -6127,10 +6126,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 = { @@ -6139,7 +6138,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'), @@ -6227,7 +6226,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}") @@ -6236,16 +6235,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", @@ -6253,7 +6252,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'), @@ -6341,7 +6340,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}") @@ -6350,10 +6349,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 = { @@ -6362,7 +6361,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'), @@ -6446,7 +6445,7 @@ def delete_ml_application(self, ml_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_ml_application got unknown kwargs: {extra_kwargs!r}") @@ -6455,10 +6454,10 @@ def delete_ml_application(self, ml_application_id, **kwargs): "mlApplicationId": ml_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 = { @@ -6467,7 +6466,7 @@ def delete_ml_application(self, ml_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'), @@ -6551,7 +6550,7 @@ def delete_ml_application_implementation(self, ml_application_implementation_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_ml_application_implementation got unknown kwargs: {extra_kwargs!r}") @@ -6560,10 +6559,10 @@ def delete_ml_application_implementation(self, ml_application_implementation_id, "mlApplicationImplementationId": ml_application_implementation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 delete_ml_application_implementation(self, ml_application_implementation_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'), @@ -6656,7 +6655,7 @@ def delete_ml_application_instance(self, ml_application_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_ml_application_instance got unknown kwargs: {extra_kwargs!r}") @@ -6665,10 +6664,10 @@ def delete_ml_application_instance(self, ml_application_instance_id, **kwargs): "mlApplicationInstanceId": ml_application_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 = { @@ -6677,7 +6676,7 @@ def delete_ml_application_instance(self, ml_application_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'), @@ -6763,7 +6762,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}") @@ -6772,10 +6771,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 = { @@ -6784,7 +6783,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'), @@ -6873,7 +6872,7 @@ def delete_model_custom_metadatum_artifact(self, model_id, metadatum_key_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_model_custom_metadatum_artifact got unknown kwargs: {extra_kwargs!r}") @@ -6883,10 +6882,10 @@ def delete_model_custom_metadatum_artifact(self, model_id, metadatum_key_name, * "metadatumKeyName": metadatum_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 = { @@ -6895,7 +6894,7 @@ def delete_model_custom_metadatum_artifact(self, model_id, metadatum_key_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'), @@ -6984,7 +6983,7 @@ def delete_model_defined_metadatum_artifact(self, model_id, metadatum_key_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_model_defined_metadatum_artifact got unknown kwargs: {extra_kwargs!r}") @@ -6994,10 +6993,10 @@ def delete_model_defined_metadatum_artifact(self, model_id, metadatum_key_name, "metadatumKeyName": metadatum_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 = { @@ -7006,7 +7005,7 @@ def delete_model_defined_metadatum_artifact(self, model_id, metadatum_key_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'), @@ -7092,7 +7091,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}") @@ -7101,10 +7100,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 = { @@ -7113,7 +7112,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'), @@ -7199,7 +7198,7 @@ def delete_model_group(self, model_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_model_group got unknown kwargs: {extra_kwargs!r}") @@ -7208,10 +7207,10 @@ def delete_model_group(self, model_group_id, **kwargs): "modelGroupId": model_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 = { @@ -7220,7 +7219,7 @@ def delete_model_group(self, model_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'), @@ -7304,7 +7303,7 @@ def delete_model_group_version_history(self, model_group_version_history_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_model_group_version_history got unknown kwargs: {extra_kwargs!r}") @@ -7313,10 +7312,10 @@ def delete_model_group_version_history(self, model_group_version_history_id, **k "modelGroupVersionHistoryId": model_group_version_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 = { @@ -7325,7 +7324,7 @@ def delete_model_group_version_history(self, model_group_version_history_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'), @@ -7414,7 +7413,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}") @@ -7423,16 +7422,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", @@ -7440,7 +7439,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'), @@ -7528,7 +7527,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}") @@ -7537,10 +7536,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 = { @@ -7549,7 +7548,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'), @@ -7643,7 +7642,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}") @@ -7652,17 +7651,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", @@ -7670,7 +7669,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'), @@ -7760,7 +7759,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}") @@ -7769,16 +7768,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", @@ -7786,7 +7785,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'), @@ -7872,7 +7871,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}") @@ -7881,10 +7880,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 = { @@ -7893,7 +7892,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'), @@ -7977,7 +7976,7 @@ def delete_schedule(self, 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_schedule got unknown kwargs: {extra_kwargs!r}") @@ -7986,10 +7985,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 = { @@ -7998,7 +7997,7 @@ def delete_schedule(self, 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'), @@ -8087,7 +8086,7 @@ def disable_ml_application_instance_view_trigger(self, disable_ml_application_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"disable_ml_application_instance_view_trigger got unknown kwargs: {extra_kwargs!r}") @@ -8096,10 +8095,10 @@ def disable_ml_application_instance_view_trigger(self, disable_ml_application_in "mlApplicationInstanceViewId": ml_application_instance_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') header_params = { @@ -8109,7 +8108,7 @@ def disable_ml_application_instance_view_trigger(self, disable_ml_application_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'), @@ -8205,7 +8204,7 @@ def enable_ml_application_instance_view_trigger(self, enable_ml_application_inst "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_ml_application_instance_view_trigger got unknown kwargs: {extra_kwargs!r}") @@ -8214,10 +8213,10 @@ def enable_ml_application_instance_view_trigger(self, enable_ml_application_inst "mlApplicationInstanceViewId": ml_application_instance_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') header_params = { @@ -8227,7 +8226,7 @@ def enable_ml_application_instance_view_trigger(self, enable_ml_application_inst "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8325,7 +8324,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}") @@ -8334,10 +8333,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 = { @@ -8347,7 +8346,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'), @@ -8426,7 +8425,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}") @@ -8435,10 +8434,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 = { @@ -8446,7 +8445,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'), @@ -8526,7 +8525,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}") @@ -8535,10 +8534,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 = { @@ -8546,7 +8545,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'), @@ -8633,7 +8632,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}") @@ -8642,10 +8641,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 = { @@ -8654,7 +8653,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'), @@ -8734,7 +8733,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}") @@ -8743,10 +8742,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 = { @@ -8754,7 +8753,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'), @@ -8832,7 +8831,7 @@ def get_ml_application(self, ml_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_ml_application got unknown kwargs: {extra_kwargs!r}") @@ -8841,10 +8840,10 @@ def get_ml_application(self, ml_application_id, **kwargs): "mlApplicationId": ml_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 = { @@ -8852,7 +8851,7 @@ def get_ml_application(self, ml_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'), @@ -8930,7 +8929,7 @@ def get_ml_application_historical_package_content(self, ml_application_implement "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ml_application_historical_package_content got unknown kwargs: {extra_kwargs!r}") @@ -8939,10 +8938,10 @@ def get_ml_application_historical_package_content(self, ml_application_implement "mlApplicationImplementationVersionId": ml_application_implementation_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 = { @@ -8950,7 +8949,7 @@ def get_ml_application_historical_package_content(self, ml_application_implement "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_ml_application_implementation(self, ml_application_implementation_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_ml_application_implementation got unknown kwargs: {extra_kwargs!r}") @@ -9037,10 +9036,10 @@ def get_ml_application_implementation(self, ml_application_implementation_id, ** "mlApplicationImplementationId": ml_application_implementation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_ml_application_implementation(self, ml_application_implementation_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'), @@ -9126,7 +9125,7 @@ def get_ml_application_implementation_version(self, ml_application_implementatio "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_ml_application_implementation_version got unknown kwargs: {extra_kwargs!r}") @@ -9135,10 +9134,10 @@ def get_ml_application_implementation_version(self, ml_application_implementatio "mlApplicationImplementationVersionId": ml_application_implementation_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 = { @@ -9146,7 +9145,7 @@ def get_ml_application_implementation_version(self, ml_application_implementatio "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_ml_application_instance(self, ml_application_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_ml_application_instance got unknown kwargs: {extra_kwargs!r}") @@ -9233,10 +9232,10 @@ def get_ml_application_instance(self, ml_application_instance_id, **kwargs): "mlApplicationInstanceId": ml_application_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 = { @@ -9244,7 +9243,7 @@ def get_ml_application_instance(self, ml_application_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'), @@ -9322,7 +9321,7 @@ def get_ml_application_instance_view(self, ml_application_instance_view_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_ml_application_instance_view got unknown kwargs: {extra_kwargs!r}") @@ -9331,10 +9330,10 @@ def get_ml_application_instance_view(self, ml_application_instance_view_id, **kw "mlApplicationInstanceViewId": ml_application_instance_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') header_params = { @@ -9342,7 +9341,7 @@ def get_ml_application_instance_view(self, ml_application_instance_view_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'), @@ -9420,7 +9419,7 @@ def get_ml_application_package_content(self, ml_application_implementation_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_ml_application_package_content got unknown kwargs: {extra_kwargs!r}") @@ -9429,10 +9428,10 @@ def get_ml_application_package_content(self, ml_application_implementation_id, * "mlApplicationImplementationId": ml_application_implementation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9440,7 +9439,7 @@ def get_ml_application_package_content(self, ml_application_implementation_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'), @@ -9520,7 +9519,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}") @@ -9529,10 +9528,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 = { @@ -9540,7 +9539,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'), @@ -9627,7 +9626,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}") @@ -9636,10 +9635,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 = { @@ -9648,7 +9647,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'), @@ -9738,7 +9737,7 @@ def get_model_custom_metadatum_artifact_content(self, model_id, metadatum_key_na "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_custom_metadatum_artifact_content got unknown kwargs: {extra_kwargs!r}") @@ -9748,10 +9747,10 @@ def get_model_custom_metadatum_artifact_content(self, model_id, metadatum_key_na "metadatumKeyName": metadatum_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 = { @@ -9760,7 +9759,7 @@ def get_model_custom_metadatum_artifact_content(self, model_id, metadatum_key_na "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'), @@ -9850,7 +9849,7 @@ def get_model_defined_metadatum_artifact_content(self, model_id, metadatum_key_n "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_defined_metadatum_artifact_content got unknown kwargs: {extra_kwargs!r}") @@ -9860,10 +9859,10 @@ def get_model_defined_metadatum_artifact_content(self, model_id, metadatum_key_n "metadatumKeyName": metadatum_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 = { @@ -9872,7 +9871,7 @@ def get_model_defined_metadatum_artifact_content(self, model_id, metadatum_key_n "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'), @@ -9952,7 +9951,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}") @@ -9961,10 +9960,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 = { @@ -9972,7 +9971,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'), @@ -10052,7 +10051,7 @@ def get_model_group(self, model_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_model_group got unknown kwargs: {extra_kwargs!r}") @@ -10061,10 +10060,10 @@ def get_model_group(self, model_group_id, **kwargs): "modelGroupId": model_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 = { @@ -10072,7 +10071,7 @@ def get_model_group(self, model_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'), @@ -10159,7 +10158,7 @@ def get_model_group_artifact_content(self, model_group_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_group_artifact_content got unknown kwargs: {extra_kwargs!r}") @@ -10168,10 +10167,10 @@ def get_model_group_artifact_content(self, model_group_id, **kwargs): "modelGroupId": model_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 = { @@ -10180,7 +10179,7 @@ def get_model_group_artifact_content(self, model_group_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'), @@ -10260,7 +10259,7 @@ def get_model_group_version_history(self, model_group_version_history_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_model_group_version_history got unknown kwargs: {extra_kwargs!r}") @@ -10269,10 +10268,10 @@ def get_model_group_version_history(self, model_group_version_history_id, **kwar "modelGroupVersionHistoryId": model_group_version_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 = { @@ -10280,7 +10279,7 @@ def get_model_group_version_history(self, model_group_version_history_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'), @@ -10360,7 +10359,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}") @@ -10369,10 +10368,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 = { @@ -10380,7 +10379,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'), @@ -10460,7 +10459,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}") @@ -10469,10 +10468,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 = { @@ -10480,7 +10479,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'), @@ -10560,7 +10559,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}") @@ -10569,10 +10568,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 = { @@ -10580,7 +10579,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'), @@ -10660,7 +10659,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}") @@ -10669,10 +10668,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 = { @@ -10680,7 +10679,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'), @@ -10760,7 +10759,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}") @@ -10769,10 +10768,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 = { @@ -10780,7 +10779,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'), @@ -10860,7 +10859,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}") @@ -10869,10 +10868,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 = { @@ -10880,7 +10879,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'), @@ -10958,7 +10957,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}") @@ -10967,10 +10966,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 = { @@ -10978,7 +10977,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'), @@ -11068,7 +11067,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}") @@ -11078,10 +11077,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 = { @@ -11090,7 +11089,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'), @@ -11172,7 +11171,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}") @@ -11181,10 +11180,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 = { @@ -11192,7 +11191,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'), @@ -11272,7 +11271,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}") @@ -11281,10 +11280,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 = { @@ -11292,7 +11291,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'), @@ -11370,7 +11369,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}") @@ -11379,10 +11378,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 = { @@ -11390,7 +11389,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'), @@ -11471,7 +11470,7 @@ def head_model_custom_metadatum_artifact(self, model_id, metadatum_key_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"head_model_custom_metadatum_artifact got unknown kwargs: {extra_kwargs!r}") @@ -11481,10 +11480,10 @@ def head_model_custom_metadatum_artifact(self, model_id, metadatum_key_name, **k "metadatumKeyName": metadatum_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 = { @@ -11492,7 +11491,7 @@ def head_model_custom_metadatum_artifact(self, model_id, metadatum_key_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'), @@ -11573,7 +11572,7 @@ def head_model_defined_metadatum_artifact(self, model_id, metadatum_key_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"head_model_defined_metadatum_artifact got unknown kwargs: {extra_kwargs!r}") @@ -11583,10 +11582,10 @@ def head_model_defined_metadatum_artifact(self, model_id, metadatum_key_name, ** "metadatumKeyName": metadatum_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 = { @@ -11594,7 +11593,7 @@ def head_model_defined_metadatum_artifact(self, model_id, metadatum_key_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'), @@ -11672,7 +11671,7 @@ def head_model_group_artifact(self, model_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"head_model_group_artifact got unknown kwargs: {extra_kwargs!r}") @@ -11681,10 +11680,10 @@ def head_model_group_artifact(self, model_group_id, **kwargs): "modelGroupId": model_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 = { @@ -11692,7 +11691,7 @@ def head_model_group_artifact(self, model_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'), @@ -11773,7 +11772,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}") @@ -11783,10 +11782,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 = { @@ -11794,7 +11793,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'), @@ -11883,7 +11882,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}") @@ -11892,10 +11891,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 = { @@ -11904,7 +11903,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'), @@ -12032,7 +12031,7 @@ def list_containers(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_containers got unknown kwargs: {extra_kwargs!r}") @@ -12069,14 +12068,14 @@ def list_containers(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'), @@ -12210,7 +12209,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}") @@ -12254,14 +12253,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'), @@ -12361,7 +12360,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}") @@ -12371,14 +12370,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'), @@ -12522,7 +12521,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}") @@ -12560,14 +12559,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'), @@ -12667,7 +12666,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}") @@ -12677,14 +12676,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'), @@ -12828,7 +12827,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}") @@ -12866,14 +12865,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'), @@ -12989,7 +12988,7 @@ def list_ml_application_implementation_versions(self, ml_application_implementat "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_ml_application_implementation_versions got unknown kwargs: {extra_kwargs!r}") @@ -13023,14 +13022,14 @@ def list_ml_application_implementation_versions(self, ml_application_implementat "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13164,7 +13163,7 @@ def list_ml_application_implementations(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_ml_application_implementations got unknown kwargs: {extra_kwargs!r}") @@ -13202,14 +13201,14 @@ def list_ml_application_implementations(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'), @@ -13339,7 +13338,7 @@ def list_ml_application_instance_views(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_ml_application_instance_views got unknown kwargs: {extra_kwargs!r}") @@ -13376,14 +13375,14 @@ def list_ml_application_instance_views(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'), @@ -13509,7 +13508,7 @@ def list_ml_application_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_ml_application_instances got unknown kwargs: {extra_kwargs!r}") @@ -13545,14 +13544,14 @@ def list_ml_application_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'), @@ -13682,7 +13681,7 @@ def list_ml_applications(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_ml_applications got unknown kwargs: {extra_kwargs!r}") @@ -13719,14 +13718,14 @@ def list_ml_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'), @@ -13868,7 +13867,7 @@ def list_model_deployment_model_states(self, model_deployment_id, compartment_id "sort_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_model_deployment_model_states got unknown kwargs: {extra_kwargs!r}") @@ -13877,10 +13876,10 @@ def list_model_deployment_model_states(self, model_deployment_id, compartment_id "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') if 'sort_order' in kwargs: @@ -13908,7 +13907,7 @@ def list_model_deployment_model_states(self, model_deployment_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", @@ -13916,7 +13915,7 @@ def list_model_deployment_model_states(self, model_deployment_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'), @@ -14019,7 +14018,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}") @@ -14029,14 +14028,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'), @@ -14180,7 +14179,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}") @@ -14218,14 +14217,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'), @@ -14367,7 +14366,7 @@ def list_model_group_models(self, model_group_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_model_group_models got unknown kwargs: {extra_kwargs!r}") @@ -14376,10 +14375,10 @@ def list_model_group_models(self, model_group_id, compartment_id, **kwargs): "modelGroupId": model_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 'lifecycle_state' in kwargs: @@ -14414,14 +14413,14 @@ def list_model_group_models(self, model_group_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'), @@ -14565,7 +14564,7 @@ def list_model_group_version_histories(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_group_version_histories got unknown kwargs: {extra_kwargs!r}") @@ -14603,14 +14602,14 @@ def list_model_group_version_histories(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'), @@ -14758,7 +14757,7 @@ def list_model_groups(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_groups got unknown kwargs: {extra_kwargs!r}") @@ -14797,14 +14796,14 @@ def list_model_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'), @@ -14952,7 +14951,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}") @@ -14998,14 +14997,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'), @@ -15162,7 +15161,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}") @@ -15210,14 +15209,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'), @@ -15317,7 +15316,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}") @@ -15327,14 +15326,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'), @@ -15478,7 +15477,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}") @@ -15516,14 +15515,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'), @@ -15666,7 +15665,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}") @@ -15704,14 +15703,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'), @@ -15854,7 +15853,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}") @@ -15892,14 +15891,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'), @@ -16037,7 +16036,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}") @@ -16074,14 +16073,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'), @@ -16213,7 +16212,7 @@ def list_schedules(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_schedules got unknown kwargs: {extra_kwargs!r}") @@ -16250,14 +16249,14 @@ def list_schedules(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'), @@ -16357,7 +16356,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}") @@ -16366,24 +16365,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'), @@ -16485,7 +16484,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}") @@ -16494,24 +16493,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'), @@ -16643,7 +16642,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}") @@ -16686,14 +16685,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'), @@ -16804,7 +16803,7 @@ def put_ml_application_package(self, ml_application_implementation_id, put_ml_ap "content_disposition", "opc_ml_app_package_args" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_ml_application_package got unknown kwargs: {extra_kwargs!r}") @@ -16813,10 +16812,10 @@ def put_ml_application_package(self, ml_application_implementation_id, put_ml_ap "mlApplicationImplementationId": ml_application_implementation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16827,7 +16826,7 @@ def put_ml_application_package(self, ml_application_implementation_id, put_ml_ap "content-disposition": kwargs.get("content_disposition", missing), "opc-ml-app-package-args": kwargs.get("opc_ml_app_package_args", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v 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: @@ -16836,7 +16835,7 @@ def put_ml_application_package(self, ml_application_implementation_id, put_ml_ap put_ml_application_package = kwargs.get("put_ml_application_package", missing) if put_ml_application_package is not missing and put_ml_application_package is not None: - if (not isinstance(put_ml_application_package, (six.binary_type, six.string_types)) and + if (not isinstance(put_ml_application_package, (bytes, str)) and not hasattr(put_ml_application_package, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -16940,7 +16939,7 @@ def recover_ml_application_instance_view(self, ml_application_instance_view_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"recover_ml_application_instance_view got unknown kwargs: {extra_kwargs!r}") @@ -16949,10 +16948,10 @@ def recover_ml_application_instance_view(self, ml_application_instance_view_id, "mlApplicationInstanceViewId": ml_application_instance_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') header_params = { @@ -16962,7 +16961,7 @@ def recover_ml_application_instance_view(self, ml_application_instance_view_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'), @@ -17056,7 +17055,7 @@ def register_model_artifact_reference(self, register_model_artifact_reference_de "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"register_model_artifact_reference got unknown kwargs: {extra_kwargs!r}") @@ -17065,10 +17064,10 @@ def register_model_artifact_reference(self, register_model_artifact_reference_de "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 = { @@ -17078,7 +17077,7 @@ def register_model_artifact_reference(self, register_model_artifact_reference_de "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'), @@ -17175,7 +17174,7 @@ def restore_archived_model_artifact(self, model_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"restore_archived_model_artifact got unknown kwargs: {extra_kwargs!r}") @@ -17184,16 +17183,16 @@ def restore_archived_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') query_params = { "restoreModelForHoursSpecified": kwargs.get("restore_model_for_hours_specified", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -17202,7 +17201,7 @@ def restore_archived_model_artifact(self, model_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'), @@ -17288,7 +17287,7 @@ def trigger_ml_application_instance_flow(self, trigger_ml_application_instance_f "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_ml_application_instance_flow got unknown kwargs: {extra_kwargs!r}") @@ -17297,10 +17296,10 @@ def trigger_ml_application_instance_flow(self, trigger_ml_application_instance_f "mlApplicationInstanceId": ml_application_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 = { @@ -17309,7 +17308,7 @@ def trigger_ml_application_instance_flow(self, trigger_ml_application_instance_f "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17395,7 +17394,7 @@ def trigger_ml_application_instance_view_flow(self, trigger_ml_application_insta "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_ml_application_instance_view_flow got unknown kwargs: {extra_kwargs!r}") @@ -17404,10 +17403,10 @@ def trigger_ml_application_instance_view_flow(self, trigger_ml_application_insta "mlApplicationInstanceViewId": ml_application_instance_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') header_params = { @@ -17416,7 +17415,7 @@ def trigger_ml_application_instance_view_flow(self, trigger_ml_application_insta "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -17508,7 +17507,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}") @@ -17517,10 +17516,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 = { @@ -17529,7 +17528,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'), @@ -17620,7 +17619,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}") @@ -17629,10 +17628,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 = { @@ -17641,7 +17640,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'), @@ -17734,7 +17733,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}") @@ -17743,10 +17742,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 = { @@ -17755,7 +17754,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'), @@ -17846,7 +17845,7 @@ def update_ml_application(self, ml_application_id, update_ml_application_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_ml_application got unknown kwargs: {extra_kwargs!r}") @@ -17855,10 +17854,10 @@ def update_ml_application(self, ml_application_id, update_ml_application_details "mlApplicationId": ml_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 = { @@ -17867,7 +17866,7 @@ def update_ml_application(self, ml_application_id, update_ml_application_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'), @@ -17958,7 +17957,7 @@ def update_ml_application_implementation(self, ml_application_implementation_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_ml_application_implementation got unknown kwargs: {extra_kwargs!r}") @@ -17967,10 +17966,10 @@ def update_ml_application_implementation(self, ml_application_implementation_id, "mlApplicationImplementationId": ml_application_implementation_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -17979,7 +17978,7 @@ def update_ml_application_implementation(self, ml_application_implementation_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'), @@ -18068,7 +18067,7 @@ def update_ml_application_implementation_version(self, ml_application_implementa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_ml_application_implementation_version got unknown kwargs: {extra_kwargs!r}") @@ -18077,10 +18076,10 @@ def update_ml_application_implementation_version(self, ml_application_implementa "mlApplicationImplementationVersionId": ml_application_implementation_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 = { @@ -18089,7 +18088,7 @@ def update_ml_application_implementation_version(self, ml_application_implementa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18180,7 +18179,7 @@ def update_ml_application_instance(self, ml_application_instance_id, update_ml_a "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_ml_application_instance got unknown kwargs: {extra_kwargs!r}") @@ -18189,10 +18188,10 @@ def update_ml_application_instance(self, ml_application_instance_id, update_ml_a "mlApplicationInstanceId": ml_application_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 = { @@ -18201,7 +18200,7 @@ def update_ml_application_instance(self, ml_application_instance_id, update_ml_a "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18290,7 +18289,7 @@ def update_ml_application_instance_view(self, ml_application_instance_view_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_ml_application_instance_view got unknown kwargs: {extra_kwargs!r}") @@ -18299,10 +18298,10 @@ def update_ml_application_instance_view(self, ml_application_instance_view_id, u "mlApplicationInstanceViewId": ml_application_instance_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') header_params = { @@ -18311,7 +18310,7 @@ def update_ml_application_instance_view(self, ml_application_instance_view_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'), @@ -18402,7 +18401,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}") @@ -18411,10 +18410,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 = { @@ -18423,7 +18422,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'), @@ -18541,7 +18540,7 @@ def update_model_custom_metadatum_artifact(self, model_id, metadatum_key_name, m "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"update_model_custom_metadatum_artifact got unknown kwargs: {extra_kwargs!r}") @@ -18551,10 +18550,10 @@ def update_model_custom_metadatum_artifact(self, model_id, metadatum_key_name, m "metadatumKeyName": metadatum_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 = { @@ -18564,7 +18563,7 @@ def update_model_custom_metadatum_artifact(self, model_id, metadatum_key_name, m "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: @@ -18573,7 +18572,7 @@ def update_model_custom_metadatum_artifact(self, model_id, metadatum_key_name, m model_custom_metadatum_artifact = kwargs.get("model_custom_metadatum_artifact", missing) if model_custom_metadatum_artifact is not missing and model_custom_metadatum_artifact is not None: - if (not isinstance(model_custom_metadatum_artifact, (six.binary_type, six.string_types)) and + if (not isinstance(model_custom_metadatum_artifact, (bytes, str)) and not hasattr(model_custom_metadatum_artifact, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -18703,7 +18702,7 @@ def update_model_defined_metadatum_artifact(self, model_id, metadatum_key_name, "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"update_model_defined_metadatum_artifact got unknown kwargs: {extra_kwargs!r}") @@ -18713,10 +18712,10 @@ def update_model_defined_metadatum_artifact(self, model_id, metadatum_key_name, "metadatumKeyName": metadatum_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 = { @@ -18726,7 +18725,7 @@ def update_model_defined_metadatum_artifact(self, model_id, metadatum_key_name, "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: @@ -18735,7 +18734,7 @@ def update_model_defined_metadatum_artifact(self, model_id, metadatum_key_name, model_defined_metadatum_artifact = kwargs.get("model_defined_metadatum_artifact", missing) if model_defined_metadatum_artifact is not missing and model_defined_metadatum_artifact is not None: - if (not isinstance(model_defined_metadatum_artifact, (six.binary_type, six.string_types)) and + if (not isinstance(model_defined_metadatum_artifact, (bytes, str)) and not hasattr(model_defined_metadatum_artifact, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -18846,7 +18845,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}") @@ -18855,10 +18854,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 = { @@ -18867,7 +18866,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'), @@ -18958,7 +18957,7 @@ def update_model_group(self, model_group_id, update_model_group_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_model_group got unknown kwargs: {extra_kwargs!r}") @@ -18967,10 +18966,10 @@ def update_model_group(self, model_group_id, update_model_group_details, **kwarg "modelGroupId": model_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 = { @@ -18979,7 +18978,7 @@ def update_model_group(self, model_group_id, update_model_group_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'), @@ -19070,7 +19069,7 @@ def update_model_group_version_history(self, model_group_version_history_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_model_group_version_history got unknown kwargs: {extra_kwargs!r}") @@ -19079,10 +19078,10 @@ def update_model_group_version_history(self, model_group_version_history_id, upd "modelGroupVersionHistoryId": model_group_version_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 = { @@ -19091,7 +19090,7 @@ def update_model_group_version_history(self, model_group_version_history_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'), @@ -19182,7 +19181,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}") @@ -19191,10 +19190,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 = { @@ -19203,7 +19202,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'), @@ -19296,7 +19295,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}") @@ -19305,10 +19304,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 = { @@ -19317,7 +19316,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'), @@ -19413,7 +19412,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}") @@ -19422,10 +19421,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 = { @@ -19434,7 +19433,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'), @@ -19527,7 +19526,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}") @@ -19536,10 +19535,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 = { @@ -19548,7 +19547,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'), @@ -19639,7 +19638,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}") @@ -19648,10 +19647,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 = { @@ -19660,7 +19659,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'), @@ -19751,7 +19750,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}") @@ -19760,10 +19759,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 = { @@ -19772,7 +19771,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'), @@ -19863,7 +19862,7 @@ def update_schedule(self, schedule_id, update_schedule_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_schedule got unknown kwargs: {extra_kwargs!r}") @@ -19872,10 +19871,10 @@ def update_schedule(self, schedule_id, update_schedule_details, **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 = { @@ -19884,7 +19883,7 @@ def update_schedule(self, schedule_id, update_schedule_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 f4cdb17852..b6ca2a0bff 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 @@ -175,7 +174,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}") @@ -184,10 +183,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 = { @@ -196,7 +195,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'), @@ -294,7 +293,7 @@ def add_dbnode_snapshots_for_exadb_vm_cluster(self, add_dbnode_snapshots_for_exa "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_dbnode_snapshots_for_exadb_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -303,10 +302,10 @@ def add_dbnode_snapshots_for_exadb_vm_cluster(self, add_dbnode_snapshots_for_exa "exadbVmClusterId": exadb_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 = { @@ -316,7 +315,7 @@ def add_dbnode_snapshots_for_exadb_vm_cluster(self, add_dbnode_snapshots_for_exa "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_standby_autonomous_container_database(self, add_standby_autonomous_conta "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_standby_autonomous_container_database got unknown kwargs: {extra_kwargs!r}") @@ -426,10 +425,10 @@ def add_standby_autonomous_container_database(self, add_standby_autonomous_conta "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 = { @@ -439,7 +438,7 @@ def add_standby_autonomous_container_database(self, add_standby_autonomous_conta "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'), @@ -534,7 +533,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}") @@ -543,10 +542,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 = { @@ -556,7 +555,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'), @@ -649,7 +648,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}") @@ -658,10 +657,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 = { @@ -671,7 +670,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'), @@ -767,7 +766,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}") @@ -776,10 +775,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 = { @@ -789,7 +788,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'), @@ -887,7 +886,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}") @@ -896,10 +895,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 = { @@ -909,7 +908,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'), @@ -1012,7 +1011,7 @@ def autonomous_database_manual_refresh(self, autonomous_database_id, autonomous_ "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"autonomous_database_manual_refresh got unknown kwargs: {extra_kwargs!r}") @@ -1021,10 +1020,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 = { @@ -1035,7 +1034,7 @@ def autonomous_database_manual_refresh(self, autonomous_database_id, autonomous_ "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'), @@ -1130,7 +1129,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}") @@ -1139,10 +1138,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 = { @@ -1152,7 +1151,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'), @@ -1246,7 +1245,7 @@ def cancel_execution_window(self, execution_window_id, cancel_execution_window_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"cancel_execution_window got unknown kwargs: {extra_kwargs!r}") @@ -1255,10 +1254,10 @@ def cancel_execution_window(self, execution_window_id, cancel_execution_window_d "executionWindowId": execution_window_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1268,7 +1267,7 @@ def cancel_execution_window(self, execution_window_id, cancel_execution_window_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'), @@ -1363,7 +1362,7 @@ def cascading_delete_scheduling_plan(self, scheduling_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"cascading_delete_scheduling_plan got unknown kwargs: {extra_kwargs!r}") @@ -1372,10 +1371,10 @@ def cascading_delete_scheduling_plan(self, scheduling_plan_id, **kwargs): "schedulingPlanId": scheduling_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 = { @@ -1385,7 +1384,7 @@ def cascading_delete_scheduling_plan(self, scheduling_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'), @@ -1483,7 +1482,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}") @@ -1492,10 +1491,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 = { @@ -1505,7 +1504,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'), @@ -1610,7 +1609,7 @@ def change_autonomous_database_compartment(self, change_compartment_details, aut "if_match", "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"change_autonomous_database_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1619,10 +1618,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 = { @@ -1633,7 +1632,7 @@ def change_autonomous_database_compartment(self, change_compartment_details, aut "if-match": kwargs.get("if_match", 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'), @@ -1729,7 +1728,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}") @@ -1738,10 +1737,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 = { @@ -1751,7 +1750,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'), @@ -1852,7 +1851,7 @@ def change_autonomous_database_subscription(self, change_autonomous_database_sub "if_match", "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"change_autonomous_database_subscription got unknown kwargs: {extra_kwargs!r}") @@ -1861,10 +1860,10 @@ def change_autonomous_database_subscription(self, change_autonomous_database_sub "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 = { @@ -1875,7 +1874,7 @@ def change_autonomous_database_subscription(self, change_autonomous_database_sub "if-match": kwargs.get("if_match", 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'), @@ -1975,7 +1974,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}") @@ -1984,10 +1983,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 = { @@ -1997,7 +1996,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'), @@ -2093,7 +2092,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}") @@ -2102,10 +2101,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 = { @@ -2115,7 +2114,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'), @@ -2215,7 +2214,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}") @@ -2224,10 +2223,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 = { @@ -2237,7 +2236,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'), @@ -2333,7 +2332,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}") @@ -2342,10 +2341,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 = { @@ -2355,7 +2354,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'), @@ -2451,7 +2450,7 @@ def change_cloud_autonomous_vm_cluster_subscription(self, change_cloud_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_cloud_autonomous_vm_cluster_subscription got unknown kwargs: {extra_kwargs!r}") @@ -2460,10 +2459,10 @@ def change_cloud_autonomous_vm_cluster_subscription(self, change_cloud_autonomou "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 = { @@ -2473,7 +2472,7 @@ def change_cloud_autonomous_vm_cluster_subscription(self, change_cloud_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'), @@ -2569,7 +2568,7 @@ def change_cloud_db_system_subscription(self, change_cloud_db_system_subscriptio "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_db_system_subscription got unknown kwargs: {extra_kwargs!r}") @@ -2578,10 +2577,10 @@ def change_cloud_db_system_subscription(self, change_cloud_db_system_subscriptio "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 = { @@ -2591,7 +2590,7 @@ def change_cloud_db_system_subscription(self, change_cloud_db_system_subscriptio "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2689,7 +2688,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}") @@ -2698,10 +2697,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 = { @@ -2711,7 +2710,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'), @@ -2807,7 +2806,7 @@ def change_cloud_exadata_infrastructure_subscription(self, change_cloud_exadata_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_subscription got unknown kwargs: {extra_kwargs!r}") @@ -2816,10 +2815,10 @@ def change_cloud_exadata_infrastructure_subscription(self, change_cloud_exadata_ "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 = { @@ -2829,7 +2828,7 @@ def change_cloud_exadata_infrastructure_subscription(self, change_cloud_exadata_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2925,7 +2924,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}") @@ -2934,10 +2933,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 = { @@ -2947,7 +2946,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'), @@ -3043,7 +3042,7 @@ def change_cloud_vm_cluster_subscription(self, change_cloud_vm_cluster_subscript "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_subscription got unknown kwargs: {extra_kwargs!r}") @@ -3052,10 +3051,10 @@ def change_cloud_vm_cluster_subscription(self, change_cloud_vm_cluster_subscript "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 = { @@ -3065,7 +3064,7 @@ def change_cloud_vm_cluster_subscription(self, change_cloud_vm_cluster_subscript "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3165,7 +3164,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}") @@ -3174,10 +3173,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 = { @@ -3187,7 +3186,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'), @@ -3288,7 +3287,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}") @@ -3297,10 +3296,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 = { @@ -3310,7 +3309,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'), @@ -3419,7 +3418,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}") @@ -3428,10 +3427,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 = { @@ -3441,7 +3440,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'), @@ -3534,7 +3533,7 @@ def change_disaster_recovery_configuration(self, autonomous_database_id, change_ "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"change_disaster_recovery_configuration got unknown kwargs: {extra_kwargs!r}") @@ -3543,10 +3542,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 = { @@ -3556,7 +3555,7 @@ def change_disaster_recovery_configuration(self, autonomous_database_id, change_ "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'), @@ -3653,7 +3652,7 @@ def change_encryption_key_location(self, database_id, encryption_key_location_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"change_encryption_key_location got unknown kwargs: {extra_kwargs!r}") @@ -3662,10 +3661,10 @@ def change_encryption_key_location(self, database_id, encryption_key_location_de "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 = { @@ -3675,7 +3674,7 @@ def change_encryption_key_location(self, database_id, encryption_key_location_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'), @@ -3772,7 +3771,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}") @@ -3781,10 +3780,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 = { @@ -3794,7 +3793,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'), @@ -3890,7 +3889,7 @@ def change_exadb_vm_cluster_compartment(self, change_exadb_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_exadb_vm_cluster_compartment got unknown kwargs: {extra_kwargs!r}") @@ -3899,10 +3898,10 @@ def change_exadb_vm_cluster_compartment(self, change_exadb_vm_cluster_compartmen "exadbVmClusterId": exadb_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 = { @@ -3912,7 +3911,7 @@ def change_exadb_vm_cluster_compartment(self, change_exadb_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'), @@ -4008,7 +4007,7 @@ def change_exadb_vm_cluster_subscription(self, change_exadb_vm_cluster_subscript "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_exadb_vm_cluster_subscription got unknown kwargs: {extra_kwargs!r}") @@ -4017,10 +4016,10 @@ def change_exadb_vm_cluster_subscription(self, change_exadb_vm_cluster_subscript "exadbVmClusterId": exadb_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 = { @@ -4030,7 +4029,7 @@ def change_exadb_vm_cluster_subscription(self, change_exadb_vm_cluster_subscript "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4126,7 +4125,7 @@ def change_exascale_db_storage_vault_compartment(self, change_exascale_db_storag "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_exascale_db_storage_vault_compartment got unknown kwargs: {extra_kwargs!r}") @@ -4135,10 +4134,10 @@ def change_exascale_db_storage_vault_compartment(self, change_exascale_db_storag "exascaleDbStorageVaultId": exascale_db_storage_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 = { @@ -4148,7 +4147,7 @@ def change_exascale_db_storage_vault_compartment(self, change_exascale_db_storag "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4244,7 +4243,7 @@ def change_exascale_db_storage_vault_subscription(self, change_exascale_db_stora "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_exascale_db_storage_vault_subscription got unknown kwargs: {extra_kwargs!r}") @@ -4253,10 +4252,10 @@ def change_exascale_db_storage_vault_subscription(self, change_exascale_db_stora "exascaleDbStorageVaultId": exascale_db_storage_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 = { @@ -4266,7 +4265,7 @@ def change_exascale_db_storage_vault_subscription(self, change_exascale_db_stora "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4367,7 +4366,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}") @@ -4376,10 +4375,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 = { @@ -4389,7 +4388,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'), @@ -4489,7 +4488,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}") @@ -4498,10 +4497,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 = { @@ -4511,7 +4510,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'), @@ -4614,7 +4613,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}") @@ -4623,10 +4622,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 = { @@ -4636,7 +4635,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'), @@ -4736,7 +4735,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}") @@ -4745,10 +4744,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 = { @@ -4758,7 +4757,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'), @@ -4854,7 +4853,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}") @@ -4863,10 +4862,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 = { @@ -4876,7 +4875,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'), @@ -4972,7 +4971,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}") @@ -4981,10 +4980,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 = { @@ -4994,7 +4993,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'), @@ -5090,7 +5089,7 @@ def change_scheduling_plan_compartment(self, change_scheduling_plan_compartment_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_scheduling_plan_compartment got unknown kwargs: {extra_kwargs!r}") @@ -5099,10 +5098,10 @@ def change_scheduling_plan_compartment(self, change_scheduling_plan_compartment_ "schedulingPlanId": scheduling_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 = { @@ -5112,7 +5111,7 @@ def change_scheduling_plan_compartment(self, change_scheduling_plan_compartment_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 change_scheduling_policy_compartment(self, change_scheduling_policy_compartm "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_scheduling_policy_compartment got unknown kwargs: {extra_kwargs!r}") @@ -5217,10 +5216,10 @@ def change_scheduling_policy_compartment(self, change_scheduling_policy_compartm "schedulingPolicyId": scheduling_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 = { @@ -5230,7 +5229,7 @@ def change_scheduling_policy_compartment(self, change_scheduling_policy_compartm "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5327,7 +5326,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}") @@ -5336,10 +5335,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 = { @@ -5349,7 +5348,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'), @@ -5444,7 +5443,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}") @@ -5453,10 +5452,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 = { @@ -5466,7 +5465,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'), @@ -5560,7 +5559,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}") @@ -5569,10 +5568,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 = { @@ -5581,7 +5580,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'), @@ -5688,7 +5687,7 @@ def configure_autonomous_database_vault_key(self, autonomous_database_id, config "opc_retry_token", "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"configure_autonomous_database_vault_key got unknown kwargs: {extra_kwargs!r}") @@ -5697,10 +5696,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 = { @@ -5711,7 +5710,7 @@ def configure_autonomous_database_vault_key(self, autonomous_database_id, config "opc-retry-token": kwargs.get("opc_retry_token", 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'), @@ -5807,7 +5806,7 @@ def configure_exascale_cloud_exadata_infrastructure(self, cloud_exadata_infrastr "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_exascale_cloud_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -5816,10 +5815,10 @@ def configure_exascale_cloud_exadata_infrastructure(self, cloud_exadata_infrastr "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 = { @@ -5829,7 +5828,7 @@ def configure_exascale_cloud_exadata_infrastructure(self, cloud_exadata_infrastr "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5927,7 +5926,7 @@ def configure_exascale_exadata_infrastructure(self, exadata_infrastructure_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"configure_exascale_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -5936,10 +5935,10 @@ def configure_exascale_exadata_infrastructure(self, exadata_infrastructure_id, c "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 = { @@ -5949,7 +5948,7 @@ def configure_exascale_exadata_infrastructure(self, exadata_infrastructure_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'), @@ -6044,7 +6043,7 @@ def configure_saas_admin_user(self, autonomous_database_id, configure_saas_admin "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"configure_saas_admin_user got unknown kwargs: {extra_kwargs!r}") @@ -6053,10 +6052,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 = { @@ -6066,7 +6065,7 @@ def configure_saas_admin_user(self, autonomous_database_id, configure_saas_admin "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'), @@ -6161,7 +6160,7 @@ def confirm_key_store_details_are_correct(self, key_store_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"confirm_key_store_details_are_correct got unknown kwargs: {extra_kwargs!r}") @@ -6170,10 +6169,10 @@ def confirm_key_store_details_are_correct(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 = { @@ -6183,7 +6182,7 @@ def confirm_key_store_details_are_correct(self, key_store_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'), @@ -6281,7 +6280,7 @@ def convert_standby_autonomous_container_database(self, convert_standby_autonomo "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"convert_standby_autonomous_container_database got unknown kwargs: {extra_kwargs!r}") @@ -6290,10 +6289,10 @@ def convert_standby_autonomous_container_database(self, convert_standby_autonomo "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 = { @@ -6303,7 +6302,7 @@ def convert_standby_autonomous_container_database(self, convert_standby_autonomo "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'), @@ -6404,7 +6403,7 @@ def convert_standby_database_type(self, database_id, convert_standby_database_ty "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_standby_database_type got unknown kwargs: {extra_kwargs!r}") @@ -6413,10 +6412,10 @@ def convert_standby_database_type(self, database_id, convert_standby_database_ty "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 = { @@ -6426,7 +6425,7 @@ def convert_standby_database_type(self, database_id, convert_standby_database_ty "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -6525,10 +6524,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 = { @@ -6537,7 +6536,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'), @@ -6635,7 +6634,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}") @@ -6644,10 +6643,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 = { @@ -6657,7 +6656,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'), @@ -6759,7 +6758,7 @@ def convert_to_standalone(self, database_id, convert_to_standalone_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"convert_to_standalone got unknown kwargs: {extra_kwargs!r}") @@ -6768,10 +6767,10 @@ def convert_to_standalone(self, database_id, convert_to_standalone_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 = { @@ -6781,7 +6780,7 @@ def convert_to_standalone(self, database_id, convert_to_standalone_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'), @@ -6868,7 +6867,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}") @@ -6879,7 +6878,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'), @@ -6960,7 +6959,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}") @@ -6970,7 +6969,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'), @@ -7059,7 +7058,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}") @@ -7068,10 +7067,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 = { @@ -7079,7 +7078,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'), @@ -7171,7 +7170,7 @@ def create_autonomous_database(self, create_autonomous_database_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"create_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -7183,7 +7182,7 @@ def create_autonomous_database(self, create_autonomous_database_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'), @@ -7273,7 +7272,7 @@ def create_autonomous_database_backup(self, create_autonomous_database_backup_de "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_autonomous_database_backup got unknown kwargs: {extra_kwargs!r}") @@ -7285,7 +7284,7 @@ def create_autonomous_database_backup(self, create_autonomous_database_backup_de "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'), @@ -7370,7 +7369,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}") @@ -7381,7 +7380,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'), @@ -7466,7 +7465,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}") @@ -7477,7 +7476,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'), @@ -7558,7 +7557,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}") @@ -7568,7 +7567,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'), @@ -7653,7 +7652,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}") @@ -7664,7 +7663,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'), @@ -7754,7 +7753,7 @@ def create_cloud_autonomous_vm_cluster(self, create_cloud_autonomous_vm_cluster_ "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_cloud_autonomous_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -7766,7 +7765,7 @@ def create_cloud_autonomous_vm_cluster(self, create_cloud_autonomous_vm_cluster_ "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'), @@ -7860,7 +7859,7 @@ def create_cloud_exadata_infrastructure(self, create_cloud_exadata_infrastructur "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_cloud_exadata_infrastructure got unknown kwargs: {extra_kwargs!r}") @@ -7872,7 +7871,7 @@ def create_cloud_exadata_infrastructure(self, create_cloud_exadata_infrastructur "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'), @@ -7964,7 +7963,7 @@ def create_cloud_vm_cluster(self, create_cloud_vm_cluster_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_cloud_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -7976,7 +7975,7 @@ def create_cloud_vm_cluster(self, create_cloud_vm_cluster_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'), @@ -8064,7 +8063,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}") @@ -8073,10 +8072,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 = { @@ -8084,7 +8083,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'), @@ -8176,7 +8175,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}") @@ -8185,10 +8184,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 = { @@ -8197,7 +8196,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'), @@ -8295,7 +8294,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}") @@ -8304,10 +8303,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 = { @@ -8315,7 +8314,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'), @@ -8407,7 +8406,7 @@ def create_database(self, create_new_database_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_database got unknown kwargs: {extra_kwargs!r}") @@ -8419,7 +8418,7 @@ def create_database(self, create_new_database_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'), @@ -8500,7 +8499,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}") @@ -8510,7 +8509,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'), @@ -8591,7 +8590,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}") @@ -8601,7 +8600,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'), @@ -8687,7 +8686,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}") @@ -8698,7 +8697,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'), @@ -8785,7 +8784,7 @@ def create_exadb_vm_cluster(self, create_exadb_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_exadb_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -8796,7 +8795,7 @@ def create_exadb_vm_cluster(self, create_exadb_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'), @@ -8881,7 +8880,7 @@ def create_exascale_db_storage_vault(self, create_exascale_db_storage_vault_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_exascale_db_storage_vault got unknown kwargs: {extra_kwargs!r}") @@ -8892,7 +8891,7 @@ def create_exascale_db_storage_vault(self, create_exascale_db_storage_vault_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'), @@ -8977,7 +8976,7 @@ def create_execution_action(self, create_execution_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_execution_action got unknown kwargs: {extra_kwargs!r}") @@ -8988,7 +8987,7 @@ def create_execution_action(self, create_execution_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'), @@ -9073,7 +9072,7 @@ def create_execution_window(self, create_execution_window_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_execution_window got unknown kwargs: {extra_kwargs!r}") @@ -9084,7 +9083,7 @@ def create_execution_window(self, create_execution_window_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'), @@ -9169,7 +9168,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}") @@ -9179,7 +9178,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'), @@ -9264,7 +9263,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}") @@ -9275,7 +9274,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'), @@ -9360,7 +9359,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}") @@ -9371,7 +9370,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'), @@ -9456,7 +9455,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}") @@ -9467,7 +9466,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'), @@ -9553,7 +9552,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}") @@ -9564,7 +9563,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'), @@ -9649,7 +9648,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}") @@ -9660,7 +9659,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'), @@ -9748,7 +9747,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}") @@ -9759,7 +9758,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'), @@ -9844,7 +9843,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}") @@ -9855,7 +9854,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'), @@ -9942,7 +9941,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}") @@ -9953,7 +9952,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'), @@ -10038,7 +10037,7 @@ def create_pluggable_database_snapshot(self, create_pluggable_database_snapshot_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_snapshot got unknown kwargs: {extra_kwargs!r}") @@ -10049,7 +10048,7 @@ def create_pluggable_database_snapshot(self, create_pluggable_database_snapshot_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10134,7 +10133,7 @@ def create_scheduled_action(self, create_scheduled_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_scheduled_action got unknown kwargs: {extra_kwargs!r}") @@ -10145,7 +10144,7 @@ def create_scheduled_action(self, create_scheduled_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'), @@ -10230,7 +10229,7 @@ def create_scheduling_plan(self, create_scheduling_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_scheduling_plan got unknown kwargs: {extra_kwargs!r}") @@ -10241,7 +10240,7 @@ def create_scheduling_plan(self, create_scheduling_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'), @@ -10326,7 +10325,7 @@ def create_scheduling_policy(self, create_scheduling_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_scheduling_policy got unknown kwargs: {extra_kwargs!r}") @@ -10337,7 +10336,7 @@ def create_scheduling_policy(self, create_scheduling_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'), @@ -10427,7 +10426,7 @@ def create_scheduling_window(self, scheduling_policy_id, create_scheduling_windo "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_scheduling_window got unknown kwargs: {extra_kwargs!r}") @@ -10436,10 +10435,10 @@ def create_scheduling_window(self, scheduling_policy_id, create_scheduling_windo "schedulingPolicyId": scheduling_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 = { @@ -10448,7 +10447,7 @@ def create_scheduling_window(self, scheduling_policy_id, create_scheduling_windo "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10536,7 +10535,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}") @@ -10547,7 +10546,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'), @@ -10638,7 +10637,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}") @@ -10647,10 +10646,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 = { @@ -10659,7 +10658,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'), @@ -10767,7 +10766,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}") @@ -10776,16 +10775,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", @@ -10793,7 +10792,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'), @@ -10880,7 +10879,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}") @@ -10889,10 +10888,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 = { @@ -10901,7 +10900,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'), @@ -10992,7 +10991,7 @@ def delete_autonomous_database(self, autonomous_database_id, **kwargs): "must_delete_associated_long_term_backups", "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"delete_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -11001,16 +11000,16 @@ 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') query_params = { "mustDeleteAssociatedLongTermBackups": kwargs.get("must_delete_associated_long_term_backups", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -11019,7 +11018,7 @@ def delete_autonomous_database(self, autonomous_database_id, **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'), @@ -11108,7 +11107,7 @@ def delete_autonomous_database_backup(self, autonomous_database_backup_id, **kwa "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"delete_autonomous_database_backup got unknown kwargs: {extra_kwargs!r}") @@ -11117,10 +11116,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 = { @@ -11130,7 +11129,7 @@ def delete_autonomous_database_backup(self, autonomous_database_backup_id, **kwa "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'), @@ -11212,7 +11211,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}") @@ -11221,10 +11220,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 = { @@ -11233,7 +11232,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'), @@ -11315,7 +11314,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}") @@ -11324,10 +11323,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 = { @@ -11336,7 +11335,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'), @@ -11414,7 +11413,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}") @@ -11423,10 +11422,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 = { @@ -11434,7 +11433,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'), @@ -11516,7 +11515,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}") @@ -11525,10 +11524,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 = { @@ -11537,7 +11536,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'), @@ -11619,7 +11618,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}") @@ -11628,10 +11627,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 = { @@ -11640,7 +11639,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'), @@ -11726,7 +11725,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}") @@ -11735,16 +11734,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", @@ -11752,7 +11751,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'), @@ -11836,7 +11835,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}") @@ -11845,10 +11844,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 = { @@ -11857,7 +11856,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'), @@ -11938,7 +11937,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}") @@ -11948,10 +11947,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 = { @@ -11959,7 +11958,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'), @@ -12044,7 +12043,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}") @@ -12054,10 +12053,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 = { @@ -12066,7 +12065,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'), @@ -12158,7 +12157,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}") @@ -12167,16 +12166,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", @@ -12184,7 +12183,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'), @@ -12264,7 +12263,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}") @@ -12273,10 +12272,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 = { @@ -12284,7 +12283,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'), @@ -12372,7 +12371,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}") @@ -12381,23 +12380,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'), @@ -12481,7 +12480,7 @@ def delete_dbnode_snapshot(self, dbnode_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_dbnode_snapshot got unknown kwargs: {extra_kwargs!r}") @@ -12490,10 +12489,10 @@ def delete_dbnode_snapshot(self, dbnode_snapshot_id, **kwargs): "dbnodeSnapshotId": dbnode_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 = { @@ -12502,7 +12501,7 @@ def delete_dbnode_snapshot(self, dbnode_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'), @@ -12584,7 +12583,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}") @@ -12593,10 +12592,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 = { @@ -12605,7 +12604,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'), @@ -12687,7 +12686,7 @@ def delete_exadb_vm_cluster(self, exadb_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_exadb_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -12696,10 +12695,10 @@ def delete_exadb_vm_cluster(self, exadb_vm_cluster_id, **kwargs): "exadbVmClusterId": exadb_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 = { @@ -12708,7 +12707,7 @@ def delete_exadb_vm_cluster(self, exadb_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'), @@ -12790,7 +12789,7 @@ def delete_exascale_db_storage_vault(self, exascale_db_storage_vault_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_exascale_db_storage_vault got unknown kwargs: {extra_kwargs!r}") @@ -12799,10 +12798,10 @@ def delete_exascale_db_storage_vault(self, exascale_db_storage_vault_id, **kwarg "exascaleDbStorageVaultId": exascale_db_storage_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 = { @@ -12811,7 +12810,7 @@ def delete_exascale_db_storage_vault(self, exascale_db_storage_vault_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'), @@ -12893,7 +12892,7 @@ def delete_execution_action(self, execution_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_execution_action got unknown kwargs: {extra_kwargs!r}") @@ -12902,10 +12901,10 @@ def delete_execution_action(self, execution_action_id, **kwargs): "executionActionId": execution_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 = { @@ -12914,7 +12913,7 @@ def delete_execution_action(self, execution_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'), @@ -12996,7 +12995,7 @@ def delete_execution_window(self, execution_window_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_execution_window got unknown kwargs: {extra_kwargs!r}") @@ -13005,10 +13004,10 @@ def delete_execution_window(self, execution_window_id, **kwargs): "executionWindowId": execution_window_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13017,7 +13016,7 @@ def delete_execution_window(self, execution_window_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13101,7 +13100,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}") @@ -13110,10 +13109,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 = { @@ -13122,7 +13121,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'), @@ -13207,7 +13206,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}") @@ -13216,10 +13215,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 = { @@ -13228,7 +13227,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'), @@ -13310,7 +13309,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}") @@ -13319,10 +13318,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 = { @@ -13331,7 +13330,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'), @@ -13414,7 +13413,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}") @@ -13423,10 +13422,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 = { @@ -13435,7 +13434,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'), @@ -13517,7 +13516,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}") @@ -13526,10 +13525,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 = { @@ -13538,7 +13537,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'), @@ -13620,7 +13619,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}") @@ -13629,10 +13628,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 = { @@ -13641,7 +13640,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'), @@ -13723,7 +13722,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}") @@ -13732,10 +13731,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 = { @@ -13744,7 +13743,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'), @@ -13826,7 +13825,7 @@ def delete_pluggable_database_snapshot(self, pluggable_database_snapshot_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_pluggable_database_snapshot got unknown kwargs: {extra_kwargs!r}") @@ -13835,10 +13834,10 @@ def delete_pluggable_database_snapshot(self, pluggable_database_snapshot_id, **k "pluggableDatabaseSnapshotId": pluggable_database_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 = { @@ -13847,7 +13846,7 @@ def delete_pluggable_database_snapshot(self, pluggable_database_snapshot_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'), @@ -13929,7 +13928,7 @@ def delete_scheduled_action(self, scheduled_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_scheduled_action got unknown kwargs: {extra_kwargs!r}") @@ -13938,10 +13937,10 @@ def delete_scheduled_action(self, scheduled_action_id, **kwargs): "scheduledActionId": scheduled_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 = { @@ -13950,7 +13949,7 @@ def delete_scheduled_action(self, scheduled_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'), @@ -14032,7 +14031,7 @@ def delete_scheduling_plan(self, scheduling_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_scheduling_plan got unknown kwargs: {extra_kwargs!r}") @@ -14041,10 +14040,10 @@ def delete_scheduling_plan(self, scheduling_plan_id, **kwargs): "schedulingPlanId": scheduling_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 = { @@ -14053,7 +14052,7 @@ def delete_scheduling_plan(self, scheduling_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'), @@ -14135,7 +14134,7 @@ def delete_scheduling_policy(self, scheduling_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_scheduling_policy got unknown kwargs: {extra_kwargs!r}") @@ -14144,10 +14143,10 @@ def delete_scheduling_policy(self, scheduling_policy_id, **kwargs): "schedulingPolicyId": scheduling_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 = { @@ -14156,7 +14155,7 @@ def delete_scheduling_policy(self, scheduling_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'), @@ -14243,7 +14242,7 @@ def delete_scheduling_window(self, scheduling_policy_id, scheduling_window_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_scheduling_window got unknown kwargs: {extra_kwargs!r}") @@ -14253,10 +14252,10 @@ def delete_scheduling_window(self, scheduling_policy_id, scheduling_window_id, * "schedulingWindowId": scheduling_window_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14265,7 +14264,7 @@ def delete_scheduling_window(self, scheduling_policy_id, scheduling_window_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'), @@ -14347,7 +14346,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}") @@ -14356,10 +14355,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 = { @@ -14368,7 +14367,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'), @@ -14456,7 +14455,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}") @@ -14466,10 +14465,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 = { @@ -14478,7 +14477,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'), @@ -14563,7 +14562,7 @@ def deregister_autonomous_database_data_safe(self, autonomous_database_id, **kwa "opc_dry_run", "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}") @@ -14572,10 +14571,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 = { @@ -14584,7 +14583,7 @@ def deregister_autonomous_database_data_safe(self, autonomous_database_id, **kwa "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'), @@ -14667,7 +14666,7 @@ def disable_autonomous_database_management(self, autonomous_database_id, **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"disable_autonomous_database_management got unknown kwargs: {extra_kwargs!r}") @@ -14676,10 +14675,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 = { @@ -14688,7 +14687,7 @@ def disable_autonomous_database_management(self, autonomous_database_id, **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'), @@ -14769,7 +14768,7 @@ def disable_autonomous_database_operations_insights(self, autonomous_database_id "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"disable_autonomous_database_operations_insights got unknown kwargs: {extra_kwargs!r}") @@ -14778,10 +14777,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 = { @@ -14790,7 +14789,7 @@ def disable_autonomous_database_operations_insights(self, autonomous_database_id "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'), @@ -14880,7 +14879,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}") @@ -14889,10 +14888,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 = { @@ -14902,7 +14901,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'), @@ -14995,7 +14994,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}") @@ -15004,10 +15003,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 = { @@ -15017,7 +15016,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'), @@ -15108,7 +15107,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}") @@ -15117,10 +15116,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 = { @@ -15130,7 +15129,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'), @@ -15225,7 +15224,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}") @@ -15234,10 +15233,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 = { @@ -15247,7 +15246,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'), @@ -15338,7 +15337,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}") @@ -15347,10 +15346,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 = { @@ -15360,7 +15359,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'), @@ -15451,7 +15450,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}") @@ -15460,10 +15459,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 = { @@ -15473,7 +15472,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'), @@ -15568,7 +15567,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}") @@ -15577,10 +15576,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 = { @@ -15590,7 +15589,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'), @@ -15681,7 +15680,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}") @@ -15690,10 +15689,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 = { @@ -15703,7 +15702,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'), @@ -15794,7 +15793,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}") @@ -15803,10 +15802,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 = { @@ -15816,7 +15815,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'), @@ -15907,7 +15906,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}") @@ -15916,10 +15915,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 = { @@ -15929,7 +15928,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'), @@ -16016,7 +16015,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}") @@ -16025,10 +16024,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 = { @@ -16037,7 +16036,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'), @@ -16130,7 +16129,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}") @@ -16139,10 +16138,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 = { @@ -16152,7 +16151,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'), @@ -16244,7 +16243,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}") @@ -16254,10 +16253,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 = { @@ -16266,7 +16265,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'), @@ -16358,7 +16357,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}") @@ -16368,10 +16367,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 = { @@ -16380,7 +16379,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'), @@ -16479,7 +16478,7 @@ def edit_autonomous_container_database_dataguard(self, edit_autonomous_container "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"edit_autonomous_container_database_dataguard got unknown kwargs: {extra_kwargs!r}") @@ -16488,10 +16487,10 @@ def edit_autonomous_container_database_dataguard(self, edit_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 = { @@ -16501,7 +16500,7 @@ def edit_autonomous_container_database_dataguard(self, edit_autonomous_container "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'), @@ -16587,7 +16586,7 @@ def enable_autonomous_database_management(self, autonomous_database_id, **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"enable_autonomous_database_management got unknown kwargs: {extra_kwargs!r}") @@ -16596,10 +16595,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 = { @@ -16608,7 +16607,7 @@ def enable_autonomous_database_management(self, autonomous_database_id, **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'), @@ -16689,7 +16688,7 @@ def enable_autonomous_database_operations_insights(self, autonomous_database_id, "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"enable_autonomous_database_operations_insights got unknown kwargs: {extra_kwargs!r}") @@ -16698,10 +16697,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 = { @@ -16710,7 +16709,7 @@ def enable_autonomous_database_operations_insights(self, autonomous_database_id, "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'), @@ -16803,7 +16802,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}") @@ -16812,10 +16811,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 = { @@ -16825,7 +16824,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'), @@ -16927,7 +16926,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}") @@ -16936,10 +16935,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 = { @@ -16949,7 +16948,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'), @@ -17045,7 +17044,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}") @@ -17054,10 +17053,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 = { @@ -17067,7 +17066,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'), @@ -17167,7 +17166,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}") @@ -17176,10 +17175,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 = { @@ -17189,7 +17188,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'), @@ -17285,7 +17284,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}") @@ -17294,10 +17293,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 = { @@ -17307,7 +17306,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'), @@ -17403,7 +17402,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}") @@ -17412,10 +17411,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 = { @@ -17425,7 +17424,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'), @@ -17525,7 +17524,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}") @@ -17534,10 +17533,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 = { @@ -17547,7 +17546,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'), @@ -17643,7 +17642,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}") @@ -17652,10 +17651,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 = { @@ -17665,7 +17664,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'), @@ -17761,7 +17760,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}") @@ -17770,10 +17769,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 = { @@ -17783,7 +17782,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'), @@ -17879,7 +17878,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}") @@ -17888,10 +17887,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 = { @@ -17901,7 +17900,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'), @@ -18010,7 +18009,7 @@ def fail_over_autonomous_database(self, autonomous_database_id, **kwargs): "peer_db_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"fail_over_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -18019,16 +18018,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", @@ -18038,7 +18037,7 @@ def fail_over_autonomous_database(self, autonomous_database_id, **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'), @@ -18128,7 +18127,7 @@ def failover_autonomous_container_database_dataguard(self, autonomous_container_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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 got unknown kwargs: {extra_kwargs!r}") @@ -18137,10 +18136,10 @@ def failover_autonomous_container_database_dataguard(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 = { @@ -18149,7 +18148,7 @@ def failover_autonomous_container_database_dataguard(self, autonomous_container_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -18236,7 +18235,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}") @@ -18246,10 +18245,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 = { @@ -18257,7 +18256,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'), @@ -18358,7 +18357,7 @@ def failover_data_guard(self, database_id, failover_data_guard_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"failover_data_guard got unknown kwargs: {extra_kwargs!r}") @@ -18367,10 +18366,10 @@ def failover_data_guard(self, database_id, failover_data_guard_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 = { @@ -18380,7 +18379,7 @@ def failover_data_guard(self, database_id, failover_data_guard_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'), @@ -18475,7 +18474,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}") @@ -18485,10 +18484,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 = { @@ -18496,7 +18495,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'), @@ -18592,7 +18591,7 @@ def generate_autonomous_database_wallet(self, autonomous_database_id, generate_a "opc_retry_token", "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"generate_autonomous_database_wallet got unknown kwargs: {extra_kwargs!r}") @@ -18601,10 +18600,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 = { @@ -18614,7 +18613,7 @@ def generate_autonomous_database_wallet(self, autonomous_database_id, generate_a "opc-retry-token": kwargs.get("opc_retry_token", 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'), @@ -18706,7 +18705,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}") @@ -18715,10 +18714,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 = { @@ -18727,7 +18726,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'), @@ -18808,7 +18807,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}") @@ -18817,10 +18816,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 = { @@ -18828,7 +18827,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'), @@ -18898,7 +18897,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}") @@ -18907,10 +18906,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 = { @@ -18991,7 +18990,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}") @@ -19001,10 +19000,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 = { @@ -19088,7 +19087,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}") @@ -19097,10 +19096,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 = { @@ -19108,7 +19107,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'), @@ -19186,7 +19185,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}") @@ -19195,10 +19194,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 = { @@ -19206,7 +19205,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'), @@ -19284,7 +19283,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}") @@ -19293,10 +19292,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 = { @@ -19304,7 +19303,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'), @@ -19387,7 +19386,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}") @@ -19397,10 +19396,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 = { @@ -19408,7 +19407,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'), @@ -19481,7 +19480,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}") @@ -19491,7 +19490,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'), @@ -19567,7 +19566,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}") @@ -19576,10 +19575,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 = { @@ -19587,7 +19586,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'), @@ -19665,7 +19664,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}") @@ -19674,10 +19673,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 = { @@ -19685,7 +19684,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'), @@ -19755,7 +19754,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}") @@ -19764,10 +19763,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 = { @@ -19843,7 +19842,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}") @@ -19852,10 +19851,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 = { @@ -19939,7 +19938,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}") @@ -19948,10 +19947,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 = { @@ -19959,7 +19958,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'), @@ -20037,7 +20036,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}") @@ -20046,10 +20045,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 = { @@ -20057,7 +20056,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'), @@ -20135,7 +20134,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}") @@ -20144,10 +20143,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 = { @@ -20155,7 +20154,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'), @@ -20225,7 +20224,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}") @@ -20234,10 +20233,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 = { @@ -20321,7 +20320,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}") @@ -20330,10 +20329,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 = { @@ -20341,7 +20340,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'), @@ -20419,7 +20418,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}") @@ -20428,10 +20427,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 = { @@ -20439,7 +20438,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'), @@ -20517,7 +20516,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}") @@ -20526,10 +20525,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 = { @@ -20537,7 +20536,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'), @@ -20615,7 +20614,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}") @@ -20624,10 +20623,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 = { @@ -20635,7 +20634,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'), @@ -20719,7 +20718,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}") @@ -20728,23 +20727,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'), @@ -20824,7 +20823,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}") @@ -20833,10 +20832,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 = { @@ -20844,7 +20843,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'), @@ -20923,7 +20922,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}") @@ -20932,10 +20931,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 = { @@ -20943,7 +20942,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'), @@ -21026,7 +21025,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}") @@ -21036,10 +21035,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 = { @@ -21047,7 +21046,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'), @@ -21130,7 +21129,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}") @@ -21140,10 +21139,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 = { @@ -21151,7 +21150,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'), @@ -21224,7 +21223,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}") @@ -21234,10 +21233,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 = { @@ -21324,7 +21323,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}") @@ -21334,10 +21333,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 = { @@ -21345,7 +21344,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'), @@ -21426,7 +21425,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}") @@ -21436,10 +21435,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 = { @@ -21447,7 +21446,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'), @@ -21522,7 +21521,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}") @@ -21532,10 +21531,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 = { @@ -21611,7 +21610,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}") @@ -21620,10 +21619,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 = { @@ -21699,7 +21698,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}") @@ -21708,10 +21707,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 = { @@ -21800,7 +21799,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}") @@ -21810,10 +21809,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 = { @@ -21821,7 +21820,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'), @@ -21891,7 +21890,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}") @@ -21900,10 +21899,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 = { @@ -21984,7 +21983,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}") @@ -21994,10 +21993,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 = { @@ -22078,7 +22077,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}") @@ -22088,10 +22087,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 = { @@ -22167,7 +22166,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}") @@ -22176,10 +22175,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 = { @@ -22268,7 +22267,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}") @@ -22277,23 +22276,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'), @@ -22372,7 +22371,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}") @@ -22381,10 +22380,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 = { @@ -22465,7 +22464,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}") @@ -22475,10 +22474,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 = { @@ -22559,7 +22558,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}") @@ -22569,10 +22568,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 = { @@ -22661,7 +22660,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}") @@ -22671,10 +22670,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 = { @@ -22682,7 +22681,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'), @@ -22760,7 +22759,7 @@ def get_dbnode_snapshot(self, dbnode_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_dbnode_snapshot got unknown kwargs: {extra_kwargs!r}") @@ -22769,10 +22768,10 @@ def get_dbnode_snapshot(self, dbnode_snapshot_id, **kwargs): "dbnodeSnapshotId": dbnode_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 = { @@ -22780,7 +22779,7 @@ def get_dbnode_snapshot(self, dbnode_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'), @@ -22865,7 +22864,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}") @@ -22874,10 +22873,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: @@ -22891,14 +22890,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'), @@ -22978,7 +22977,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}") @@ -22987,10 +22986,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 = { @@ -22998,7 +22997,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'), @@ -23082,7 +23081,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}") @@ -23091,23 +23090,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'), @@ -23198,7 +23197,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}") @@ -23207,10 +23206,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 = { @@ -23218,7 +23217,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'), @@ -23296,7 +23295,7 @@ def get_exadb_vm_cluster(self, exadb_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_exadb_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -23305,10 +23304,10 @@ def get_exadb_vm_cluster(self, exadb_vm_cluster_id, **kwargs): "exadbVmClusterId": exadb_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 = { @@ -23316,7 +23315,7 @@ def get_exadb_vm_cluster(self, exadb_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'), @@ -23399,7 +23398,7 @@ def get_exadb_vm_cluster_update(self, exadb_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_exadb_vm_cluster_update got unknown kwargs: {extra_kwargs!r}") @@ -23409,10 +23408,10 @@ def get_exadb_vm_cluster_update(self, exadb_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 = { @@ -23420,7 +23419,7 @@ def get_exadb_vm_cluster_update(self, exadb_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'), @@ -23503,7 +23502,7 @@ def get_exadb_vm_cluster_update_history_entry(self, exadb_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_exadb_vm_cluster_update_history_entry got unknown kwargs: {extra_kwargs!r}") @@ -23513,10 +23512,10 @@ def get_exadb_vm_cluster_update_history_entry(self, exadb_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 = { @@ -23524,7 +23523,7 @@ def get_exadb_vm_cluster_update_history_entry(self, exadb_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'), @@ -23602,7 +23601,7 @@ def get_exascale_db_storage_vault(self, exascale_db_storage_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_exascale_db_storage_vault got unknown kwargs: {extra_kwargs!r}") @@ -23611,10 +23610,10 @@ def get_exascale_db_storage_vault(self, exascale_db_storage_vault_id, **kwargs): "exascaleDbStorageVaultId": exascale_db_storage_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 = { @@ -23622,7 +23621,7 @@ def get_exascale_db_storage_vault(self, exascale_db_storage_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'), @@ -23700,7 +23699,7 @@ def get_execution_action(self, execution_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_execution_action got unknown kwargs: {extra_kwargs!r}") @@ -23709,10 +23708,10 @@ def get_execution_action(self, execution_action_id, **kwargs): "executionActionId": execution_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 = { @@ -23720,7 +23719,7 @@ def get_execution_action(self, execution_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'), @@ -23798,7 +23797,7 @@ def get_execution_window(self, execution_window_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_window got unknown kwargs: {extra_kwargs!r}") @@ -23807,10 +23806,10 @@ def get_execution_window(self, execution_window_id, **kwargs): "executionWindowId": execution_window_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 get_execution_window(self, execution_window_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -23892,7 +23891,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}") @@ -23901,10 +23900,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 = { @@ -23988,7 +23987,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}") @@ -23997,10 +23996,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 = { @@ -24008,7 +24007,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'), @@ -24087,7 +24086,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}") @@ -24096,10 +24095,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 = { @@ -24107,7 +24106,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'), @@ -24185,7 +24184,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}") @@ -24194,10 +24193,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 = { @@ -24205,7 +24204,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'), @@ -24284,7 +24283,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}") @@ -24293,10 +24292,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 = { @@ -24304,7 +24303,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'), @@ -24393,7 +24392,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}") @@ -24410,14 +24409,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'), @@ -24495,7 +24494,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}") @@ -24504,10 +24503,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 = { @@ -24515,7 +24514,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'), @@ -24583,7 +24582,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}") @@ -24592,10 +24591,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 = { @@ -24669,7 +24668,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}") @@ -24678,10 +24677,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 = { @@ -24765,7 +24764,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}") @@ -24774,10 +24773,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 = { @@ -24785,7 +24784,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'), @@ -24868,7 +24867,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}") @@ -24878,10 +24877,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 = { @@ -24889,7 +24888,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'), @@ -24959,7 +24958,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}") @@ -24968,10 +24967,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 = { @@ -25055,7 +25054,7 @@ def get_pluggable_database_snapshot(self, pluggable_database_snapshot_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_pluggable_database_snapshot got unknown kwargs: {extra_kwargs!r}") @@ -25064,10 +25063,10 @@ def get_pluggable_database_snapshot(self, pluggable_database_snapshot_id, **kwar "pluggableDatabaseSnapshotId": pluggable_database_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 = { @@ -25075,7 +25074,7 @@ def get_pluggable_database_snapshot(self, pluggable_database_snapshot_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'), @@ -25153,7 +25152,7 @@ def get_scheduled_action(self, scheduled_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_scheduled_action got unknown kwargs: {extra_kwargs!r}") @@ -25162,10 +25161,10 @@ def get_scheduled_action(self, scheduled_action_id, **kwargs): "scheduledActionId": scheduled_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 = { @@ -25173,7 +25172,7 @@ def get_scheduled_action(self, scheduled_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'), @@ -25251,7 +25250,7 @@ def get_scheduling_plan(self, scheduling_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_scheduling_plan got unknown kwargs: {extra_kwargs!r}") @@ -25260,10 +25259,10 @@ def get_scheduling_plan(self, scheduling_plan_id, **kwargs): "schedulingPlanId": scheduling_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 = { @@ -25271,7 +25270,7 @@ def get_scheduling_plan(self, scheduling_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'), @@ -25349,7 +25348,7 @@ def get_scheduling_policy(self, scheduling_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_scheduling_policy got unknown kwargs: {extra_kwargs!r}") @@ -25358,10 +25357,10 @@ def get_scheduling_policy(self, scheduling_policy_id, **kwargs): "schedulingPolicyId": scheduling_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 = { @@ -25369,7 +25368,7 @@ def get_scheduling_policy(self, scheduling_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'), @@ -25452,7 +25451,7 @@ def get_scheduling_window(self, scheduling_policy_id, scheduling_window_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_scheduling_window got unknown kwargs: {extra_kwargs!r}") @@ -25462,10 +25461,10 @@ def get_scheduling_window(self, scheduling_policy_id, scheduling_window_id, **kw "schedulingWindowId": scheduling_window_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -25473,7 +25472,7 @@ def get_scheduling_window(self, scheduling_policy_id, scheduling_window_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'), @@ -25551,7 +25550,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}") @@ -25560,10 +25559,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 = { @@ -25571,7 +25570,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'), @@ -25655,7 +25654,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}") @@ -25665,10 +25664,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 = { @@ -25676,7 +25675,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'), @@ -25751,7 +25750,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}") @@ -25761,10 +25760,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 = { @@ -25845,7 +25844,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}") @@ -25855,10 +25854,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 = { @@ -25947,7 +25946,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}") @@ -25957,10 +25956,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 = { @@ -25968,7 +25967,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'), @@ -26051,7 +26050,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}") @@ -26061,10 +26060,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 = { @@ -26072,7 +26071,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'), @@ -26152,7 +26151,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}") @@ -26162,7 +26161,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'), @@ -26269,7 +26268,7 @@ def launch_db_system(self, launch_db_system_details, **kwargs): "opc_retry_token", "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"launch_db_system got unknown kwargs: {extra_kwargs!r}") @@ -26280,7 +26279,7 @@ def launch_db_system(self, launch_db_system_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", 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'), @@ -26393,7 +26392,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}") @@ -26428,14 +26427,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'), @@ -26562,7 +26561,7 @@ def list_autonomous_container_database_backups(self, **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_autonomous_container_database_backups got unknown kwargs: {extra_kwargs!r}") @@ -26607,14 +26606,14 @@ def list_autonomous_container_database_backups(self, **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'), @@ -26696,7 +26695,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}") @@ -26705,17 +26704,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", @@ -26819,7 +26818,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}") @@ -26844,14 +26843,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'), @@ -26989,7 +26988,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}") @@ -27037,7 +27036,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", @@ -27177,7 +27176,7 @@ def list_autonomous_database_backups(self, **kwargs): "infrastructure_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}") @@ -27224,14 +27223,14 @@ def list_autonomous_database_backups(self, **kwargs): "keyStoreId": kwargs.get("key_store_id", missing), "infrastructureType": kwargs.get("infrastructure_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'), @@ -27318,7 +27317,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}") @@ -27335,14 +27334,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'), @@ -27463,7 +27462,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}") @@ -27472,10 +27471,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: @@ -27516,14 +27515,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'), @@ -27607,7 +27606,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}") @@ -27616,17 +27615,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", @@ -27719,7 +27718,7 @@ def list_autonomous_database_peers(self, autonomous_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_autonomous_database_peers got unknown kwargs: {extra_kwargs!r}") @@ -27728,24 +27727,24 @@ def list_autonomous_database_peers(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 = { "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'), @@ -27833,7 +27832,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}") @@ -27842,24 +27841,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'), @@ -27974,7 +27973,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}") @@ -28016,14 +28015,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'), @@ -28185,7 +28184,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}") @@ -28251,14 +28250,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'), @@ -28359,7 +28358,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}") @@ -28385,14 +28384,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'), @@ -28490,7 +28489,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}") @@ -28516,14 +28515,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'), @@ -28612,7 +28611,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}") @@ -28623,14 +28622,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'), @@ -28740,7 +28739,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}") @@ -28776,7 +28775,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", @@ -28878,7 +28877,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}") @@ -28897,14 +28896,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'), @@ -28996,7 +28995,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}") @@ -29005,10 +29004,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 = { @@ -29016,14 +29015,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'), @@ -29137,7 +29136,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}") @@ -29173,14 +29172,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'), @@ -29270,7 +29269,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}") @@ -29281,14 +29280,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'), @@ -29409,7 +29408,7 @@ def list_backups(self, **kwargs): "time_expiry_scheduled_less_than", "backup_destination_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_backups got unknown kwargs: {extra_kwargs!r}") @@ -29441,7 +29440,7 @@ def list_backups(self, **kwargs): "timeExpiryScheduledLessThan": kwargs.get("time_expiry_scheduled_less_than", missing), "backupDestinationType": kwargs.get("backup_destination_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", @@ -29539,7 +29538,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}") @@ -29548,10 +29547,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 = { @@ -29559,14 +29558,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'), @@ -29684,7 +29683,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}") @@ -29721,14 +29720,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'), @@ -29840,7 +29839,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}") @@ -29876,14 +29875,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'), @@ -29975,7 +29974,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}") @@ -29984,10 +29983,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: @@ -30002,14 +30001,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'), @@ -30103,7 +30102,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}") @@ -30112,10 +30111,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: @@ -30130,14 +30129,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'), @@ -30257,7 +30256,7 @@ def list_cloud_vm_clusters(self, compartment_id, **kwargs): "opc_request_id", "vm_cluster_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_cloud_vm_clusters got unknown kwargs: {extra_kwargs!r}") @@ -30301,14 +30300,14 @@ def list_cloud_vm_clusters(self, compartment_id, **kwargs): "displayName": kwargs.get("display_name", missing), "vmClusterType": kwargs.get("vm_cluster_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'), @@ -30378,7 +30377,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}") @@ -30387,10 +30386,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 = { @@ -30504,7 +30503,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}") @@ -30513,10 +30512,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: @@ -30548,14 +30547,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'), @@ -30650,7 +30649,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}") @@ -30659,10 +30658,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: @@ -30678,7 +30677,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", @@ -30767,7 +30766,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}") @@ -30776,17 +30775,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", @@ -30924,7 +30923,7 @@ def list_database_software_images(self, compartment_id, **kwargs): "db_system_id", "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}") @@ -30978,7 +30977,7 @@ def list_database_software_images(self, compartment_id, **kwargs): "dbSystemId": kwargs.get("db_system_id", 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", @@ -31093,7 +31092,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}") @@ -31102,10 +31101,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: @@ -31144,14 +31143,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'), @@ -31269,7 +31268,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}") @@ -31306,7 +31305,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", @@ -31393,7 +31392,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}") @@ -31402,17 +31401,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", @@ -31501,7 +31500,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}") @@ -31510,17 +31509,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", @@ -31653,7 +31652,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}") @@ -31692,7 +31691,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", @@ -31815,7 +31814,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}") @@ -31852,7 +31851,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", @@ -31970,7 +31969,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}") @@ -32006,14 +32005,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'), @@ -32090,7 +32089,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}") @@ -32098,14 +32097,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'), @@ -32187,7 +32186,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}") @@ -32196,17 +32195,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", @@ -32295,7 +32294,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}") @@ -32304,17 +32303,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", @@ -32411,7 +32410,7 @@ def list_db_system_shapes(self, compartment_id, **kwargs): "page", "shape_attribute" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -32423,7 +32422,7 @@ def list_db_system_shapes(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "shapeAttribute": kwargs.get("shape_attribute", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -32524,7 +32523,7 @@ def list_db_system_storage_performances(self, storage_management, **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_db_system_storage_performances got unknown kwargs: {extra_kwargs!r}") @@ -32548,14 +32547,14 @@ def list_db_system_storage_performances(self, storage_management, **kwargs): "databaseEdition": kwargs.get("database_edition", 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'), @@ -32665,7 +32664,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}") @@ -32674,10 +32673,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: @@ -32716,14 +32715,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'), @@ -32807,7 +32806,7 @@ def list_db_system_upgrades(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_upgrades got unknown kwargs: {extra_kwargs!r}") @@ -32816,17 +32815,17 @@ def list_db_system_upgrades(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", @@ -32956,7 +32955,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}") @@ -32993,7 +32992,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", @@ -33110,7 +33109,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}") @@ -33133,7 +33132,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", @@ -33254,7 +33253,7 @@ def list_dbnode_snapshots(self, compartment_id, **kwargs): "source_dbnode_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_dbnode_snapshots got unknown kwargs: {extra_kwargs!r}") @@ -33291,14 +33290,14 @@ def list_dbnode_snapshots(self, compartment_id, **kwargs): "clusterId": kwargs.get("cluster_id", missing), "sourceDbnodeId": kwargs.get("source_dbnode_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'), @@ -33413,7 +33412,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}") @@ -33457,14 +33456,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'), @@ -33556,7 +33555,7 @@ def list_exadb_vm_cluster_update_history_entries(self, exadb_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_exadb_vm_cluster_update_history_entries got unknown kwargs: {extra_kwargs!r}") @@ -33565,10 +33564,10 @@ def list_exadb_vm_cluster_update_history_entries(self, exadb_vm_cluster_id, **kw "exadbVmClusterId": exadb_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: @@ -33583,14 +33582,14 @@ def list_exadb_vm_cluster_update_history_entries(self, exadb_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'), @@ -33688,7 +33687,7 @@ def list_exadb_vm_cluster_updates(self, exadb_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_exadb_vm_cluster_updates got unknown kwargs: {extra_kwargs!r}") @@ -33697,10 +33696,10 @@ def list_exadb_vm_cluster_updates(self, exadb_vm_cluster_id, **kwargs): "exadbVmClusterId": exadb_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: @@ -33716,14 +33715,14 @@ def list_exadb_vm_cluster_updates(self, exadb_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'), @@ -33841,7 +33840,7 @@ def list_exadb_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_exadb_vm_clusters got unknown kwargs: {extra_kwargs!r}") @@ -33878,14 +33877,14 @@ def list_exadb_vm_clusters(self, compartment_id, **kwargs): "clusterPlacementGroupId": kwargs.get("cluster_placement_group_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'), @@ -34017,7 +34016,7 @@ def list_exascale_db_storage_vaults(self, compartment_id, **kwargs): "opc_request_id", "exadata_infrastructure_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_exascale_db_storage_vaults got unknown kwargs: {extra_kwargs!r}") @@ -34058,14 +34057,14 @@ def list_exascale_db_storage_vaults(self, compartment_id, **kwargs): "displayName": kwargs.get("display_name", missing), "exadataInfrastructureId": kwargs.get("exadata_infrastructure_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'), @@ -34177,7 +34176,7 @@ def list_execution_actions(self, compartment_id, **kwargs): "execution_window_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_execution_actions got unknown kwargs: {extra_kwargs!r}") @@ -34213,14 +34212,14 @@ def list_execution_actions(self, compartment_id, **kwargs): "executionWindowId": kwargs.get("execution_window_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'), @@ -34332,7 +34331,7 @@ def list_execution_windows(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_execution_windows got unknown kwargs: {extra_kwargs!r}") @@ -34368,14 +34367,14 @@ def list_execution_windows(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'), @@ -34486,7 +34485,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}") @@ -34521,14 +34520,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'), @@ -34644,7 +34643,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}") @@ -34680,14 +34679,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'), @@ -34798,7 +34797,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}") @@ -34833,14 +34832,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'), @@ -34958,7 +34957,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}") @@ -34994,14 +34993,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'), @@ -35103,7 +35102,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}") @@ -35131,7 +35130,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", @@ -35256,7 +35255,7 @@ def list_gi_version_minor_versions(self, version, **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_gi_version_minor_versions got unknown kwargs: {extra_kwargs!r}") @@ -35265,10 +35264,10 @@ def list_gi_version_minor_versions(self, version, **kwargs): "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') if 'shape_family' in kwargs: @@ -35303,14 +35302,14 @@ def list_gi_version_minor_versions(self, version, **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'), @@ -35416,7 +35415,7 @@ def list_gi_versions(self, compartment_id, **kwargs): "resource_id", "shape_attribute" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -35438,7 +35437,7 @@ def list_gi_versions(self, compartment_id, **kwargs): "resourceId": kwargs.get("resource_id", missing), "shapeAttribute": kwargs.get("shape_attribute", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -35529,7 +35528,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}") @@ -35539,14 +35538,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'), @@ -35674,7 +35673,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}") @@ -35734,7 +35733,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", @@ -35871,7 +35870,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}") @@ -35932,7 +35931,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", @@ -36045,7 +36044,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}") @@ -36080,14 +36079,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'), @@ -36173,7 +36172,7 @@ def list_params_for_action_type(self, 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_params_for_action_type got unknown kwargs: {extra_kwargs!r}") @@ -36189,14 +36188,14 @@ def list_params_for_action_type(self, 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'), @@ -36306,7 +36305,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}") @@ -36315,10 +36314,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: @@ -36357,14 +36356,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'), @@ -36485,7 +36484,7 @@ def list_pluggable_database_snapshots(self, **kwargs): "pluggable_database_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_pluggable_database_snapshots got unknown kwargs: {extra_kwargs!r}") @@ -36522,14 +36521,14 @@ def list_pluggable_database_snapshots(self, **kwargs): "clusterId": kwargs.get("cluster_id", missing), "pluggableDatabaseId": kwargs.get("pluggable_database_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'), @@ -36640,7 +36639,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}") @@ -36676,7 +36675,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", @@ -36777,7 +36776,7 @@ def list_recommended_scheduled_actions(self, scheduling_policy_id, scheduling_po "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_recommended_scheduled_actions got unknown kwargs: {extra_kwargs!r}") @@ -36786,10 +36785,10 @@ def list_recommended_scheduled_actions(self, scheduling_policy_id, scheduling_po "schedulingPolicyId": scheduling_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') plan_intent_allowed_values = ["EXADATA_INFRASTRUCTURE_FULL_SOFTWARE_UPDATE"] @@ -36804,14 +36803,14 @@ def list_recommended_scheduled_actions(self, scheduling_policy_id, scheduling_po "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'), @@ -36899,7 +36898,7 @@ def list_resource_pool_members(self, autonomous_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_resource_pool_members got unknown kwargs: {extra_kwargs!r}") @@ -36908,24 +36907,24 @@ def list_resource_pool_members(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 = { "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'), @@ -37047,7 +37046,7 @@ def list_scheduled_actions(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_scheduled_actions got unknown kwargs: {extra_kwargs!r}") @@ -37085,14 +37084,14 @@ def list_scheduled_actions(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'), @@ -37212,7 +37211,7 @@ def list_scheduling_plans(self, compartment_id, **kwargs): "resource_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_scheduling_plans got unknown kwargs: {extra_kwargs!r}") @@ -37250,14 +37249,14 @@ def list_scheduling_plans(self, compartment_id, **kwargs): "resourceId": kwargs.get("resource_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", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -37365,7 +37364,7 @@ def list_scheduling_policies(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_scheduling_policies got unknown kwargs: {extra_kwargs!r}") @@ -37400,14 +37399,14 @@ def list_scheduling_policies(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'), @@ -37521,7 +37520,7 @@ def list_scheduling_windows(self, scheduling_policy_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_scheduling_windows got unknown kwargs: {extra_kwargs!r}") @@ -37530,10 +37529,10 @@ def list_scheduling_windows(self, scheduling_policy_id, **kwargs): "schedulingPolicyId": scheduling_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_by' in kwargs: @@ -37566,14 +37565,14 @@ def list_scheduling_windows(self, scheduling_policy_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'), @@ -37685,7 +37684,7 @@ def list_system_version_minor_versions(self, major_version, compartment_id, gi_v "resource_id", "is_latest" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_version_minor_versions got unknown kwargs: {extra_kwargs!r}") @@ -37694,10 +37693,10 @@ def list_system_version_minor_versions(self, major_version, compartment_id, gi_v "majorVersion": major_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') if 'sort_order' in kwargs: @@ -37717,14 +37716,14 @@ def list_system_version_minor_versions(self, major_version, compartment_id, gi_v "resourceId": kwargs.get("resource_id", 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'), @@ -37833,7 +37832,7 @@ def list_system_versions(self, compartment_id, gi_version, **kwargs): "is_latest", "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_system_versions got unknown kwargs: {extra_kwargs!r}") @@ -37855,14 +37854,14 @@ def list_system_versions(self, compartment_id, gi_version, **kwargs): "resourceId": kwargs.get("resource_id", missing), "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'), @@ -37975,7 +37974,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}") @@ -37984,10 +37983,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: @@ -38020,14 +38019,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'), @@ -38111,7 +38110,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}") @@ -38120,17 +38119,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", @@ -38219,7 +38218,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}") @@ -38228,17 +38227,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", @@ -38343,7 +38342,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}") @@ -38352,10 +38351,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: @@ -38378,14 +38377,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'), @@ -38485,7 +38484,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}") @@ -38494,10 +38493,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: @@ -38520,14 +38519,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'), @@ -38648,7 +38647,7 @@ def list_vm_clusters(self, compartment_id, **kwargs): "opc_request_id", "vm_cluster_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_vm_clusters got unknown kwargs: {extra_kwargs!r}") @@ -38692,14 +38691,14 @@ def list_vm_clusters(self, compartment_id, **kwargs): "displayName": kwargs.get("display_name", missing), "vmClusterType": kwargs.get("vm_cluster_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'), @@ -38795,7 +38794,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}") @@ -38804,10 +38803,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 = { @@ -38817,7 +38816,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'), @@ -38909,7 +38908,7 @@ def migrate_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"migrate_autonomous_container_database_dataguard_association got unknown kwargs: {extra_kwargs!r}") @@ -38919,10 +38918,10 @@ def migrate_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 = { @@ -38931,7 +38930,7 @@ def migrate_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'), @@ -39030,7 +39029,7 @@ def migrate_data_guard_association_to_multi_data_guards(self, database_id, data_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_data_guard_association_to_multi_data_guards got unknown kwargs: {extra_kwargs!r}") @@ -39040,10 +39039,10 @@ def migrate_data_guard_association_to_multi_data_guards(self, database_id, data_ "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 = { @@ -39053,7 +39052,7 @@ def migrate_data_guard_association_to_multi_data_guards(self, database_id, data_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -39149,7 +39148,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}") @@ -39158,10 +39157,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 = { @@ -39171,7 +39170,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'), @@ -39269,7 +39268,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}") @@ -39278,10 +39277,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 = { @@ -39291,7 +39290,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'), @@ -39389,7 +39388,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}") @@ -39398,10 +39397,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 = { @@ -39411,7 +39410,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'), @@ -39509,7 +39508,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}") @@ -39518,10 +39517,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 = { @@ -39531,7 +39530,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'), @@ -39629,7 +39628,7 @@ def mount_dbnode_snapshot(self, mount_dbnode_snapshot_details, dbnode_snapshot_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"mount_dbnode_snapshot got unknown kwargs: {extra_kwargs!r}") @@ -39638,10 +39637,10 @@ def mount_dbnode_snapshot(self, mount_dbnode_snapshot_details, dbnode_snapshot_i "dbnodeSnapshotId": dbnode_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 = { @@ -39651,7 +39650,7 @@ def mount_dbnode_snapshot(self, mount_dbnode_snapshot_details, dbnode_snapshot_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'), @@ -39749,7 +39748,7 @@ def move_execution_action_member(self, execution_action_id, move_execution_actio "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_execution_action_member got unknown kwargs: {extra_kwargs!r}") @@ -39758,10 +39757,10 @@ def move_execution_action_member(self, execution_action_id, move_execution_actio "executionActionId": execution_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 = { @@ -39771,7 +39770,7 @@ def move_execution_action_member(self, execution_action_id, move_execution_actio "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -39866,7 +39865,7 @@ def refresh_data_guard_health_status(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"refresh_data_guard_health_status got unknown kwargs: {extra_kwargs!r}") @@ -39875,10 +39874,10 @@ def refresh_data_guard_health_status(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 = { @@ -39888,7 +39887,7 @@ def refresh_data_guard_health_status(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'), @@ -39981,7 +39980,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}") @@ -39990,10 +39989,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 = { @@ -40003,7 +40002,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'), @@ -40091,7 +40090,7 @@ def register_autonomous_database_data_safe(self, autonomous_database_id, **kwarg "opc_dry_run", "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}") @@ -40100,10 +40099,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 = { @@ -40112,7 +40111,7 @@ def register_autonomous_database_data_safe(self, autonomous_database_id, **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'), @@ -40207,7 +40206,7 @@ def register_cloud_vm_cluster_pkcs(self, cloud_vm_cluster_id, register_cloud_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"register_cloud_vm_cluster_pkcs got unknown kwargs: {extra_kwargs!r}") @@ -40216,10 +40215,10 @@ def register_cloud_vm_cluster_pkcs(self, cloud_vm_cluster_id, register_cloud_vm_ "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 = { @@ -40229,7 +40228,7 @@ def register_cloud_vm_cluster_pkcs(self, cloud_vm_cluster_id, register_cloud_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'), @@ -40317,7 +40316,7 @@ def reinstate_autonomous_container_database_dataguard(self, autonomous_container "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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 got unknown kwargs: {extra_kwargs!r}") @@ -40326,10 +40325,10 @@ def reinstate_autonomous_container_database_dataguard(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 = { @@ -40338,7 +40337,7 @@ def reinstate_autonomous_container_database_dataguard(self, autonomous_container "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -40423,7 +40422,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}") @@ -40433,10 +40432,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 = { @@ -40444,7 +40443,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'), @@ -40541,7 +40540,7 @@ def reinstate_data_guard(self, database_id, reinstate_data_guard_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"reinstate_data_guard got unknown kwargs: {extra_kwargs!r}") @@ -40550,10 +40549,10 @@ def reinstate_data_guard(self, database_id, reinstate_data_guard_details, **kwar "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 = { @@ -40563,7 +40562,7 @@ def reinstate_data_guard(self, database_id, reinstate_data_guard_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'), @@ -40654,7 +40653,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}") @@ -40664,10 +40663,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 = { @@ -40675,7 +40674,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'), @@ -40774,7 +40773,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}") @@ -40783,10 +40782,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 = { @@ -40796,7 +40795,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'), @@ -40894,7 +40893,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}") @@ -40903,10 +40902,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 = { @@ -40916,7 +40915,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'), @@ -41014,7 +41013,7 @@ def remove_virtual_machine_from_exadb_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_exadb_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -41023,10 +41022,10 @@ def remove_virtual_machine_from_exadb_vm_cluster(self, remove_virtual_machine_fr "exadbVmClusterId": exadb_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 = { @@ -41036,7 +41035,7 @@ def remove_virtual_machine_from_exadb_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'), @@ -41134,7 +41133,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}") @@ -41143,10 +41142,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 = { @@ -41156,7 +41155,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'), @@ -41254,7 +41253,7 @@ def reorder_execution_actions(self, execution_window_id, reorder_execution_actio "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"reorder_execution_actions got unknown kwargs: {extra_kwargs!r}") @@ -41263,10 +41262,10 @@ def reorder_execution_actions(self, execution_window_id, reorder_execution_actio "executionWindowId": execution_window_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -41276,7 +41275,7 @@ def reorder_execution_actions(self, execution_window_id, reorder_execution_actio "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -41374,7 +41373,7 @@ def reorder_scheduled_actions(self, reorder_scheduled_actions_details, schedulin "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"reorder_scheduled_actions got unknown kwargs: {extra_kwargs!r}") @@ -41383,10 +41382,10 @@ def reorder_scheduled_actions(self, reorder_scheduled_actions_details, schedulin "schedulingPlanId": scheduling_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 = { @@ -41396,7 +41395,7 @@ def reorder_scheduled_actions(self, reorder_scheduled_actions_details, schedulin "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -41500,7 +41499,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}") @@ -41510,10 +41509,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 = { @@ -41523,7 +41522,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'), @@ -41621,7 +41620,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}") @@ -41630,7 +41629,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", @@ -41639,7 +41638,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'), @@ -41724,7 +41723,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}") @@ -41733,10 +41732,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 = { @@ -41745,7 +41744,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'), @@ -41830,7 +41829,7 @@ def restart_autonomous_database(self, autonomous_database_id, **kwargs): "if_match", "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"restart_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -41839,10 +41838,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 = { @@ -41851,7 +41850,7 @@ def restart_autonomous_database(self, autonomous_database_id, **kwargs): "if-match": kwargs.get("if_match", 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'), @@ -41939,7 +41938,7 @@ def restore_autonomous_database(self, autonomous_database_id, restore_autonomous "if_match", "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"restore_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -41948,10 +41947,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 = { @@ -41960,7 +41959,7 @@ def restore_autonomous_database(self, autonomous_database_id, restore_autonomous "if-match": kwargs.get("if_match", 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'), @@ -42045,7 +42044,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}") @@ -42054,10 +42053,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 = { @@ -42065,7 +42064,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'), @@ -42165,7 +42164,7 @@ def rotate_autonomous_container_database_encryption_key(self, autonomous_contain "opc_request_id", "rotate_autonomous_container_database_encryption_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"rotate_autonomous_container_database_encryption_key got unknown kwargs: {extra_kwargs!r}") @@ -42174,10 +42173,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 = { @@ -42187,7 +42186,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'), @@ -42288,7 +42287,7 @@ def rotate_autonomous_database_encryption_key(self, autonomous_database_id, **kw "opc_request_id", "rotate_autonomous_database_encryption_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"rotate_autonomous_database_encryption_key got unknown kwargs: {extra_kwargs!r}") @@ -42297,10 +42296,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 = { @@ -42310,7 +42309,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'), @@ -42408,7 +42407,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}") @@ -42417,10 +42416,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 = { @@ -42430,7 +42429,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'), @@ -42526,7 +42525,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}") @@ -42535,10 +42534,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 = { @@ -42548,7 +42547,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'), @@ -42645,7 +42644,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}") @@ -42654,10 +42653,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 = { @@ -42667,7 +42666,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'), @@ -42764,7 +42763,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}") @@ -42773,10 +42772,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 = { @@ -42786,7 +42785,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'), @@ -42879,7 +42878,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}") @@ -42888,10 +42887,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 = { @@ -42901,7 +42900,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'), @@ -42992,7 +42991,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}") @@ -43001,10 +43000,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 = { @@ -43014,7 +43013,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'), @@ -43105,7 +43104,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}") @@ -43114,10 +43113,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 = { @@ -43127,7 +43126,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'), @@ -43220,7 +43219,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}") @@ -43229,10 +43228,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 = { @@ -43242,7 +43241,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'), @@ -43321,7 +43320,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}") @@ -43330,10 +43329,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 = { @@ -43341,7 +43340,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'), @@ -43434,7 +43433,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}") @@ -43443,16 +43442,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", @@ -43460,7 +43459,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'), @@ -43558,7 +43557,7 @@ def set_db_key_version(self, database_id, set_key_version_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"set_db_key_version got unknown kwargs: {extra_kwargs!r}") @@ -43567,10 +43566,10 @@ def set_db_key_version(self, database_id, set_key_version_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 = { @@ -43580,7 +43579,7 @@ def set_db_key_version(self, database_id, set_key_version_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'), @@ -43680,7 +43679,7 @@ def set_pdb_key_version(self, pluggable_database_id, set_key_version_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"set_pdb_key_version got unknown kwargs: {extra_kwargs!r}") @@ -43689,10 +43688,10 @@ def set_pdb_key_version(self, pluggable_database_id, set_key_version_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 = { @@ -43702,7 +43701,7 @@ def set_pdb_key_version(self, pluggable_database_id, set_key_version_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'), @@ -43790,7 +43789,7 @@ def shrink_autonomous_database(self, autonomous_database_id, **kwargs): "if_match", "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"shrink_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -43799,10 +43798,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 = { @@ -43811,7 +43810,7 @@ def shrink_autonomous_database(self, autonomous_database_id, **kwargs): "if-match": kwargs.get("if_match", 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'), @@ -43896,7 +43895,7 @@ def start_autonomous_database(self, autonomous_database_id, **kwargs): "if_match", "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"start_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -43905,10 +43904,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 = { @@ -43917,7 +43916,7 @@ def start_autonomous_database(self, autonomous_database_id, **kwargs): "if-match": kwargs.get("if_match", 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'), @@ -44009,7 +44008,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}") @@ -44018,10 +44017,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 = { @@ -44031,7 +44030,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'), @@ -44121,7 +44120,7 @@ def stop_autonomous_database(self, autonomous_database_id, **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"stop_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -44130,10 +44129,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 = { @@ -44143,7 +44142,7 @@ def stop_autonomous_database(self, autonomous_database_id, **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'), @@ -44235,7 +44234,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}") @@ -44244,10 +44243,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 = { @@ -44257,7 +44256,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'), @@ -44358,7 +44357,7 @@ def switch_over_data_guard(self, database_id, switch_over_data_guard_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"switch_over_data_guard got unknown kwargs: {extra_kwargs!r}") @@ -44367,10 +44366,10 @@ def switch_over_data_guard(self, database_id, switch_over_data_guard_details, ** "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 = { @@ -44380,7 +44379,7 @@ def switch_over_data_guard(self, database_id, switch_over_data_guard_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'), @@ -44470,7 +44469,7 @@ def switchover_autonomous_container_database_dataguard(self, autonomous_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"switchover_autonomous_container_database_dataguard got unknown kwargs: {extra_kwargs!r}") @@ -44479,10 +44478,10 @@ def switchover_autonomous_container_database_dataguard(self, autonomous_containe "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 = { @@ -44491,7 +44490,7 @@ def switchover_autonomous_container_database_dataguard(self, autonomous_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'), @@ -44578,7 +44577,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}") @@ -44588,10 +44587,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 = { @@ -44599,7 +44598,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'), @@ -44705,7 +44704,7 @@ def switchover_autonomous_database(self, autonomous_database_id, **kwargs): "peer_db_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"switchover_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -44714,16 +44713,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", @@ -44733,7 +44732,7 @@ def switchover_autonomous_database(self, autonomous_database_id, **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'), @@ -44827,7 +44826,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}") @@ -44837,10 +44836,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 = { @@ -44848,7 +44847,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'), @@ -44930,7 +44929,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}") @@ -44939,10 +44938,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 = { @@ -44950,7 +44949,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'), @@ -45028,7 +45027,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}") @@ -45037,10 +45036,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 = { @@ -45048,7 +45047,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'), @@ -45133,7 +45132,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}") @@ -45142,10 +45141,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 = { @@ -45153,7 +45152,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'), @@ -45246,7 +45245,7 @@ def unmount_dbnode_snapshot(self, unmount_dbnode_snapshot_details, dbnode_snapsh "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"unmount_dbnode_snapshot got unknown kwargs: {extra_kwargs!r}") @@ -45255,10 +45254,10 @@ def unmount_dbnode_snapshot(self, unmount_dbnode_snapshot_details, dbnode_snapsh "dbnodeSnapshotId": dbnode_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 = { @@ -45268,7 +45267,7 @@ def unmount_dbnode_snapshot(self, unmount_dbnode_snapshot_details, dbnode_snapsh "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -45366,7 +45365,7 @@ def unregister_cloud_vm_cluster_pkcs(self, cloud_vm_cluster_id, unregister_cloud "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"unregister_cloud_vm_cluster_pkcs got unknown kwargs: {extra_kwargs!r}") @@ -45375,10 +45374,10 @@ def unregister_cloud_vm_cluster_pkcs(self, cloud_vm_cluster_id, unregister_cloud "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 = { @@ -45388,7 +45387,7 @@ def unregister_cloud_vm_cluster_pkcs(self, cloud_vm_cluster_id, unregister_cloud "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -45472,7 +45471,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}") @@ -45481,10 +45480,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 = { @@ -45492,7 +45491,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'), @@ -45586,7 +45585,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}") @@ -45596,10 +45595,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 = { @@ -45608,7 +45607,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'), @@ -45702,7 +45701,7 @@ def update_autonomous_database(self, autonomous_database_id, update_autonomous_d "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_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -45711,10 +45710,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 = { @@ -45724,7 +45723,7 @@ def update_autonomous_database(self, autonomous_database_id, update_autonomous_d "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'), @@ -45818,7 +45817,7 @@ def update_autonomous_database_backup(self, autonomous_database_backup_id, updat "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_autonomous_database_backup got unknown kwargs: {extra_kwargs!r}") @@ -45827,10 +45826,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 = { @@ -45840,7 +45839,7 @@ def update_autonomous_database_backup(self, autonomous_database_backup_id, updat "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'), @@ -45923,7 +45922,7 @@ def update_autonomous_database_regional_wallet(self, update_autonomous_database_ "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_autonomous_database_regional_wallet got unknown kwargs: {extra_kwargs!r}") @@ -45934,7 +45933,7 @@ def update_autonomous_database_regional_wallet(self, update_autonomous_database_ "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'), @@ -46019,7 +46018,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}") @@ -46028,10 +46027,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 = { @@ -46040,7 +46039,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'), @@ -46128,7 +46127,7 @@ def update_autonomous_database_wallet(self, autonomous_database_id, update_auton "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_autonomous_database_wallet got unknown kwargs: {extra_kwargs!r}") @@ -46137,10 +46136,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 = { @@ -46149,7 +46148,7 @@ def update_autonomous_database_wallet(self, autonomous_database_id, update_auton "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'), @@ -46232,7 +46231,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}") @@ -46241,10 +46240,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 = { @@ -46252,7 +46251,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'), @@ -46341,7 +46340,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}") @@ -46350,10 +46349,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 = { @@ -46362,7 +46361,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'), @@ -46451,7 +46450,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}") @@ -46460,10 +46459,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 = { @@ -46472,7 +46471,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'), @@ -46564,7 +46563,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}") @@ -46573,10 +46572,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 = { @@ -46585,7 +46584,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'), @@ -46679,7 +46678,7 @@ def update_cloud_autonomous_vm_cluster(self, cloud_autonomous_vm_cluster_id, upd "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_cloud_autonomous_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -46688,10 +46687,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 = { @@ -46701,7 +46700,7 @@ def update_cloud_autonomous_vm_cluster(self, cloud_autonomous_vm_cluster_id, upd "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'), @@ -46790,7 +46789,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}") @@ -46799,10 +46798,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 = { @@ -46811,7 +46810,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'), @@ -46900,7 +46899,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}") @@ -46909,10 +46908,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 = { @@ -46921,7 +46920,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'), @@ -47010,7 +47009,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}") @@ -47019,10 +47018,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 = { @@ -47031,7 +47030,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'), @@ -47123,7 +47122,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}") @@ -47133,10 +47132,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 = { @@ -47145,7 +47144,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'), @@ -47237,7 +47236,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}") @@ -47247,10 +47246,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 = { @@ -47259,7 +47258,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'), @@ -47359,7 +47358,7 @@ def update_data_guard(self, database_id, update_data_guard_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_data_guard got unknown kwargs: {extra_kwargs!r}") @@ -47368,10 +47367,10 @@ def update_data_guard(self, database_id, update_data_guard_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 = { @@ -47381,7 +47380,7 @@ def update_data_guard(self, database_id, update_data_guard_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'), @@ -47476,7 +47475,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}") @@ -47486,10 +47485,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 = { @@ -47498,7 +47497,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'), @@ -47583,7 +47582,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}") @@ -47592,10 +47591,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 = { @@ -47603,7 +47602,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'), @@ -47688,7 +47687,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}") @@ -47697,10 +47696,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 = { @@ -47708,7 +47707,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'), @@ -47793,7 +47792,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}") @@ -47802,10 +47801,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 = { @@ -47813,7 +47812,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'), @@ -47902,7 +47901,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}") @@ -47911,10 +47910,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 = { @@ -47923,7 +47922,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'), @@ -48020,7 +48019,7 @@ def update_db_system(self, db_system_id, update_db_system_details, **kwargs): "if_match", "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_db_system got unknown kwargs: {extra_kwargs!r}") @@ -48029,10 +48028,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 = { @@ -48041,7 +48040,7 @@ def update_db_system(self, db_system_id, update_db_system_details, **kwargs): "if-match": kwargs.get("if_match", 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'), @@ -48131,7 +48130,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}") @@ -48140,10 +48139,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 = { @@ -48152,7 +48151,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'), @@ -48251,7 +48250,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}") @@ -48260,10 +48259,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 = { @@ -48272,7 +48271,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'), @@ -48361,7 +48360,7 @@ def update_exadb_vm_cluster(self, exadb_vm_cluster_id, update_exadb_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_exadb_vm_cluster got unknown kwargs: {extra_kwargs!r}") @@ -48370,10 +48369,10 @@ def update_exadb_vm_cluster(self, exadb_vm_cluster_id, update_exadb_vm_cluster_d "exadbVmClusterId": exadb_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 = { @@ -48382,7 +48381,7 @@ def update_exadb_vm_cluster(self, exadb_vm_cluster_id, update_exadb_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'), @@ -48471,7 +48470,7 @@ def update_exascale_db_storage_vault(self, exascale_db_storage_vault_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_exascale_db_storage_vault got unknown kwargs: {extra_kwargs!r}") @@ -48480,10 +48479,10 @@ def update_exascale_db_storage_vault(self, exascale_db_storage_vault_id, update_ "exascaleDbStorageVaultId": exascale_db_storage_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 = { @@ -48492,7 +48491,7 @@ def update_exascale_db_storage_vault(self, exascale_db_storage_vault_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'), @@ -48581,7 +48580,7 @@ def update_execution_action(self, execution_action_id, update_execution_action_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_execution_action got unknown kwargs: {extra_kwargs!r}") @@ -48590,10 +48589,10 @@ def update_execution_action(self, execution_action_id, update_execution_action_d "executionActionId": execution_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 = { @@ -48602,7 +48601,7 @@ def update_execution_action(self, execution_action_id, update_execution_action_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'), @@ -48691,7 +48690,7 @@ def update_execution_window(self, execution_window_id, update_execution_window_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_execution_window got unknown kwargs: {extra_kwargs!r}") @@ -48700,10 +48699,10 @@ def update_execution_window(self, execution_window_id, update_execution_window_d "executionWindowId": execution_window_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -48712,7 +48711,7 @@ def update_execution_window(self, execution_window_id, update_execution_window_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'), @@ -48804,7 +48803,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}") @@ -48813,10 +48812,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 = { @@ -48825,7 +48824,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'), @@ -48915,7 +48914,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}") @@ -48924,10 +48923,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 = { @@ -48936,7 +48935,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'), @@ -49025,7 +49024,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}") @@ -49034,10 +49033,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 = { @@ -49046,7 +49045,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'), @@ -49137,7 +49136,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}") @@ -49146,10 +49145,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 = { @@ -49158,7 +49157,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'), @@ -49247,7 +49246,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}") @@ -49256,10 +49255,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 = { @@ -49268,7 +49267,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'), @@ -49351,7 +49350,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}") @@ -49360,10 +49359,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 = { @@ -49371,7 +49370,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'), @@ -49460,7 +49459,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}") @@ -49469,10 +49468,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 = { @@ -49481,7 +49480,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'), @@ -49566,7 +49565,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}") @@ -49575,10 +49574,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 = { @@ -49586,7 +49585,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'), @@ -49675,7 +49674,7 @@ def update_scheduled_action(self, scheduled_action_id, update_scheduled_action_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_scheduled_action got unknown kwargs: {extra_kwargs!r}") @@ -49684,10 +49683,10 @@ def update_scheduled_action(self, scheduled_action_id, update_scheduled_action_d "scheduledActionId": scheduled_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 = { @@ -49696,7 +49695,7 @@ def update_scheduled_action(self, scheduled_action_id, update_scheduled_action_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'), @@ -49785,7 +49784,7 @@ def update_scheduling_policy(self, scheduling_policy_id, update_scheduling_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_scheduling_policy got unknown kwargs: {extra_kwargs!r}") @@ -49794,10 +49793,10 @@ def update_scheduling_policy(self, scheduling_policy_id, update_scheduling_polic "schedulingPolicyId": scheduling_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 = { @@ -49806,7 +49805,7 @@ def update_scheduling_policy(self, scheduling_policy_id, update_scheduling_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'), @@ -49900,7 +49899,7 @@ def update_scheduling_window(self, scheduling_policy_id, scheduling_window_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_scheduling_window got unknown kwargs: {extra_kwargs!r}") @@ -49910,10 +49909,10 @@ def update_scheduling_window(self, scheduling_policy_id, scheduling_window_id, u "schedulingWindowId": scheduling_window_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -49922,7 +49921,7 @@ def update_scheduling_window(self, scheduling_policy_id, scheduling_window_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'), @@ -50011,7 +50010,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}") @@ -50020,10 +50019,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 = { @@ -50032,7 +50031,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'), @@ -50127,7 +50126,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}") @@ -50137,10 +50136,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 = { @@ -50149,7 +50148,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'), @@ -50238,7 +50237,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}") @@ -50247,10 +50246,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 = { @@ -50259,7 +50258,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'), @@ -50356,7 +50355,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}") @@ -50365,10 +50364,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 = { @@ -50378,7 +50377,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'), @@ -50472,7 +50471,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}") @@ -50482,10 +50481,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 = { @@ -50494,7 +50493,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 dace06744a..904af63058 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 @@ -178,7 +177,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}") @@ -188,10 +187,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 = { @@ -200,7 +199,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'), @@ -294,7 +293,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}") @@ -303,10 +302,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 = { @@ -315,7 +314,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'), @@ -426,7 +425,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}") @@ -435,10 +434,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: @@ -463,7 +462,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", @@ -471,7 +470,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'), @@ -574,7 +573,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}") @@ -583,10 +582,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 = { @@ -595,7 +594,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'), @@ -695,7 +694,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}") @@ -704,10 +703,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 = { @@ -717,7 +716,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'), @@ -817,7 +816,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}") @@ -826,10 +825,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 = { @@ -839,7 +838,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'), @@ -939,7 +938,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}") @@ -948,10 +947,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 = { @@ -961,7 +960,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'), @@ -1061,7 +1060,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}") @@ -1070,10 +1069,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 = { @@ -1083,7 +1082,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'), @@ -1185,7 +1184,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}") @@ -1194,10 +1193,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 = { @@ -1207,7 +1206,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'), @@ -1309,7 +1308,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}") @@ -1318,10 +1317,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 = { @@ -1331,7 +1330,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'), @@ -1417,7 +1416,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}") @@ -1426,10 +1425,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 = { @@ -1437,7 +1436,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'), @@ -1519,7 +1518,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}") @@ -1528,10 +1527,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 = { @@ -1539,7 +1538,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'), @@ -1620,7 +1619,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}") @@ -1629,10 +1628,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 = { @@ -1640,7 +1639,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'), @@ -1735,7 +1734,7 @@ def check_cloud_db_system_connector_connection_status(self, cloud_db_system_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_cloud_db_system_connector_connection_status got unknown kwargs: {extra_kwargs!r}") @@ -1744,10 +1743,10 @@ def check_cloud_db_system_connector_connection_status(self, cloud_db_system_conn "cloudDbSystemConnectorId": cloud_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 = { @@ -1757,7 +1756,7 @@ def check_cloud_db_system_connector_connection_status(self, cloud_db_system_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'), @@ -1855,7 +1854,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}") @@ -1864,10 +1863,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 = { @@ -1877,7 +1876,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'), @@ -1974,7 +1973,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}") @@ -1983,10 +1982,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 = { @@ -1996,7 +1995,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'), @@ -2092,7 +2091,7 @@ def check_external_my_sql_database_connector_connection_status(self, external_my "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_my_sql_database_connector_connection_status got unknown kwargs: {extra_kwargs!r}") @@ -2101,10 +2100,10 @@ def check_external_my_sql_database_connector_connection_status(self, external_my "externalMySqlDatabaseConnectorId": external_my_sql_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 = { @@ -2114,7 +2113,7 @@ def check_external_my_sql_database_connector_connection_status(self, external_my "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2197,7 +2196,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}") @@ -2206,10 +2205,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 = { @@ -2217,7 +2216,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'), @@ -2300,7 +2299,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}") @@ -2309,10 +2308,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 = { @@ -2320,7 +2319,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'), @@ -2404,7 +2403,7 @@ def create_cloud_db_system(self, create_cloud_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_cloud_db_system got unknown kwargs: {extra_kwargs!r}") @@ -2415,7 +2414,7 @@ def create_cloud_db_system(self, create_cloud_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'), @@ -2502,7 +2501,7 @@ def create_cloud_db_system_connector(self, create_cloud_db_system_connector_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_cloud_db_system_connector got unknown kwargs: {extra_kwargs!r}") @@ -2513,7 +2512,7 @@ def create_cloud_db_system_connector(self, create_cloud_db_system_connector_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'), @@ -2600,7 +2599,7 @@ def create_cloud_db_system_discovery(self, create_cloud_db_system_discovery_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_cloud_db_system_discovery got unknown kwargs: {extra_kwargs!r}") @@ -2611,7 +2610,7 @@ def create_cloud_db_system_discovery(self, create_cloud_db_system_discovery_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'), @@ -2698,7 +2697,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}") @@ -2709,7 +2708,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'), @@ -2794,7 +2793,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}") @@ -2805,7 +2804,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'), @@ -2892,7 +2891,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}") @@ -2903,7 +2902,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'), @@ -2990,7 +2989,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}") @@ -3001,7 +3000,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'), @@ -3093,7 +3092,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}") @@ -3104,7 +3103,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'), @@ -3191,7 +3190,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}") @@ -3202,7 +3201,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'), @@ -3289,7 +3288,7 @@ def create_external_my_sql_database(self, create_external_my_sql_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"create_external_my_sql_database got unknown kwargs: {extra_kwargs!r}") @@ -3300,7 +3299,7 @@ def create_external_my_sql_database(self, create_external_my_sql_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'), @@ -3390,7 +3389,7 @@ def create_external_my_sql_database_connector(self, create_external_my_sql_datab "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_my_sql_database_connector got unknown kwargs: {extra_kwargs!r}") @@ -3398,7 +3397,7 @@ def create_external_my_sql_database_connector(self, create_external_my_sql_datab query_params = { "isTestConnectionParam": is_test_connection_param } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -3406,7 +3405,7 @@ def create_external_my_sql_database_connector(self, create_external_my_sql_datab "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_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}") @@ -3508,7 +3507,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'), @@ -3594,7 +3593,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}") @@ -3605,7 +3604,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'), @@ -3690,7 +3689,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}") @@ -3701,7 +3700,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'), @@ -3791,7 +3790,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}") @@ -3800,10 +3799,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 = { @@ -3812,7 +3811,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'), @@ -3901,7 +3900,7 @@ def delete_cloud_db_system(self, cloud_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_cloud_db_system got unknown kwargs: {extra_kwargs!r}") @@ -3910,10 +3909,10 @@ def delete_cloud_db_system(self, cloud_db_system_id, **kwargs): "cloudDbSystemId": cloud_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 = { @@ -3922,7 +3921,7 @@ def delete_cloud_db_system(self, cloud_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'), @@ -4006,7 +4005,7 @@ def delete_cloud_db_system_connector(self, cloud_db_system_connector_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"delete_cloud_db_system_connector got unknown kwargs: {extra_kwargs!r}") @@ -4015,10 +4014,10 @@ def delete_cloud_db_system_connector(self, cloud_db_system_connector_id, **kwarg "cloudDbSystemConnectorId": cloud_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 = { @@ -4027,7 +4026,7 @@ def delete_cloud_db_system_connector(self, cloud_db_system_connector_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'), @@ -4111,7 +4110,7 @@ def delete_cloud_db_system_discovery(self, cloud_db_system_discovery_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"delete_cloud_db_system_discovery got unknown kwargs: {extra_kwargs!r}") @@ -4120,10 +4119,10 @@ def delete_cloud_db_system_discovery(self, cloud_db_system_discovery_id, **kwarg "cloudDbSystemDiscoveryId": cloud_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 = { @@ -4132,7 +4131,7 @@ def delete_cloud_db_system_discovery(self, cloud_db_system_discovery_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'), @@ -4216,7 +4215,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}") @@ -4225,10 +4224,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 = { @@ -4237,7 +4236,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'), @@ -4321,7 +4320,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}") @@ -4330,10 +4329,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 = { @@ -4342,7 +4341,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'), @@ -4426,7 +4425,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}") @@ -4435,10 +4434,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 = { @@ -4447,7 +4446,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'), @@ -4531,7 +4530,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}") @@ -4540,10 +4539,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 = { @@ -4552,7 +4551,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'), @@ -4636,7 +4635,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}") @@ -4645,10 +4644,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 = { @@ -4657,7 +4656,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'), @@ -4741,7 +4740,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}") @@ -4750,10 +4749,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 = { @@ -4762,7 +4761,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'), @@ -4844,7 +4843,7 @@ def delete_external_my_sql_database(self, external_my_sql_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_external_my_sql_database got unknown kwargs: {extra_kwargs!r}") @@ -4853,10 +4852,10 @@ def delete_external_my_sql_database(self, external_my_sql_database_id, **kwargs) "externalMySqlDatabaseId": external_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 = { @@ -4865,7 +4864,7 @@ def delete_external_my_sql_database(self, external_my_sql_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'), @@ -4947,7 +4946,7 @@ def delete_external_my_sql_database_connector(self, external_my_sql_database_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"delete_external_my_sql_database_connector got unknown kwargs: {extra_kwargs!r}") @@ -4956,10 +4955,10 @@ def delete_external_my_sql_database_connector(self, external_my_sql_database_con "externalMySqlDatabaseConnectorId": external_my_sql_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 = { @@ -4968,7 +4967,7 @@ def delete_external_my_sql_database_connector(self, external_my_sql_database_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'), @@ -5050,7 +5049,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}") @@ -5059,10 +5058,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 = { @@ -5071,7 +5070,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'), @@ -5156,7 +5155,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}") @@ -5165,10 +5164,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 = { @@ -5177,7 +5176,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'), @@ -5261,7 +5260,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}") @@ -5270,10 +5269,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 = { @@ -5282,7 +5281,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'), @@ -5361,7 +5360,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}") @@ -5371,10 +5370,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 = { @@ -5382,7 +5381,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'), @@ -5461,7 +5460,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}") @@ -5470,10 +5469,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 = { @@ -5481,7 +5480,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'), @@ -5565,7 +5564,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}") @@ -5574,10 +5573,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 = { @@ -5585,7 +5584,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'), @@ -5682,7 +5681,7 @@ def disable_autonomous_database_management_feature(self, autonomous_database_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_autonomous_database_management_feature got unknown kwargs: {extra_kwargs!r}") @@ -5691,10 +5690,10 @@ def disable_autonomous_database_management_feature(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 = { @@ -5704,7 +5703,7 @@ def disable_autonomous_database_management_feature(self, autonomous_database_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'), @@ -5802,7 +5801,7 @@ def disable_cloud_db_system_database_management(self, cloud_db_system_id, **kwar "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_cloud_db_system_database_management got unknown kwargs: {extra_kwargs!r}") @@ -5811,10 +5810,10 @@ def disable_cloud_db_system_database_management(self, cloud_db_system_id, **kwar "cloudDbSystemId": cloud_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 = { @@ -5824,7 +5823,7 @@ def disable_cloud_db_system_database_management(self, cloud_db_system_id, **kwar "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'), @@ -5920,7 +5919,7 @@ def disable_cloud_db_system_stack_monitoring(self, cloud_db_system_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"disable_cloud_db_system_stack_monitoring got unknown kwargs: {extra_kwargs!r}") @@ -5929,10 +5928,10 @@ def disable_cloud_db_system_stack_monitoring(self, cloud_db_system_id, **kwargs) "cloudDbSystemId": cloud_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 = { @@ -5942,7 +5941,7 @@ def disable_cloud_db_system_stack_monitoring(self, cloud_db_system_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'), @@ -6040,7 +6039,7 @@ def disable_database_management_feature(self, database_id, disable_database_mana "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_database_management_feature got unknown kwargs: {extra_kwargs!r}") @@ -6049,10 +6048,10 @@ def disable_database_management_feature(self, database_id, disable_database_mana "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 = { @@ -6062,7 +6061,7 @@ def disable_database_management_feature(self, database_id, disable_database_mana "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'), @@ -6162,7 +6161,7 @@ def disable_external_container_database_management_feature(self, external_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"disable_external_container_database_management_feature got unknown kwargs: {extra_kwargs!r}") @@ -6171,10 +6170,10 @@ def disable_external_container_database_management_feature(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 = { @@ -6184,7 +6183,7 @@ def disable_external_container_database_management_feature(self, external_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'), @@ -6282,7 +6281,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}") @@ -6291,10 +6290,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 = { @@ -6304,7 +6303,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'), @@ -6400,7 +6399,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}") @@ -6409,10 +6408,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 = { @@ -6422,7 +6421,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'), @@ -6524,7 +6523,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}") @@ -6533,10 +6532,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 = { @@ -6546,7 +6545,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'), @@ -6639,7 +6638,7 @@ def disable_external_my_sql_database_management(self, external_my_sql_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"disable_external_my_sql_database_management got unknown kwargs: {extra_kwargs!r}") @@ -6648,10 +6647,10 @@ def disable_external_my_sql_database_management(self, external_my_sql_database_i "externalMySqlDatabaseId": external_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 = { @@ -6661,7 +6660,7 @@ def disable_external_my_sql_database_management(self, external_my_sql_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'), @@ -6759,7 +6758,7 @@ def disable_external_non_container_database_management_feature(self, external_no "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_non_container_database_management_feature got unknown kwargs: {extra_kwargs!r}") @@ -6768,10 +6767,10 @@ def disable_external_non_container_database_management_feature(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 = { @@ -6781,7 +6780,7 @@ def disable_external_non_container_database_management_feature(self, external_no "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'), @@ -6881,7 +6880,7 @@ def disable_external_pluggable_database_management_feature(self, external_plugga "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_pluggable_database_management_feature got unknown kwargs: {extra_kwargs!r}") @@ -6890,10 +6889,10 @@ def disable_external_pluggable_database_management_feature(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 = { @@ -6903,7 +6902,7 @@ def disable_external_pluggable_database_management_feature(self, external_plugga "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'), @@ -6990,7 +6989,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}") @@ -6999,10 +6998,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 = { @@ -7010,7 +7009,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'), @@ -7107,7 +7106,7 @@ def disable_pluggable_database_management_feature(self, pluggable_database_id, 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"disable_pluggable_database_management_feature got unknown kwargs: {extra_kwargs!r}") @@ -7116,10 +7115,10 @@ def disable_pluggable_database_management_feature(self, pluggable_database_id, d "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 = { @@ -7129,7 +7128,7 @@ def disable_pluggable_database_management_feature(self, pluggable_database_id, 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'), @@ -7215,7 +7214,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}") @@ -7224,10 +7223,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 = { @@ -7235,7 +7234,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'), @@ -7345,7 +7344,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}") @@ -7357,7 +7356,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'), @@ -7441,7 +7440,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}") @@ -7450,10 +7449,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 = { @@ -7461,7 +7460,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'), @@ -7553,7 +7552,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}") @@ -7563,10 +7562,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 = { @@ -7575,7 +7574,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'), @@ -7666,7 +7665,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}") @@ -7675,10 +7674,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 = { @@ -7686,7 +7685,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'), @@ -7779,7 +7778,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}") @@ -7788,10 +7787,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 = { @@ -7799,7 +7798,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'), @@ -7896,7 +7895,7 @@ def enable_autonomous_database_management_feature(self, autonomous_database_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"enable_autonomous_database_management_feature got unknown kwargs: {extra_kwargs!r}") @@ -7905,10 +7904,10 @@ def enable_autonomous_database_management_feature(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 = { @@ -7918,7 +7917,7 @@ def enable_autonomous_database_management_feature(self, autonomous_database_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'), @@ -8019,7 +8018,7 @@ def enable_cloud_db_system_database_management(self, cloud_db_system_id, enable_ "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_cloud_db_system_database_management got unknown kwargs: {extra_kwargs!r}") @@ -8028,10 +8027,10 @@ def enable_cloud_db_system_database_management(self, cloud_db_system_id, enable_ "cloudDbSystemId": cloud_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 = { @@ -8041,7 +8040,7 @@ def enable_cloud_db_system_database_management(self, cloud_db_system_id, enable_ "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'), @@ -8142,7 +8141,7 @@ def enable_cloud_db_system_stack_monitoring(self, cloud_db_system_id, enable_clo "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_cloud_db_system_stack_monitoring got unknown kwargs: {extra_kwargs!r}") @@ -8151,10 +8150,10 @@ def enable_cloud_db_system_stack_monitoring(self, cloud_db_system_id, enable_clo "cloudDbSystemId": cloud_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 = { @@ -8164,7 +8163,7 @@ def enable_cloud_db_system_stack_monitoring(self, cloud_db_system_id, enable_clo "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'), @@ -8264,7 +8263,7 @@ def enable_database_management_feature(self, database_id, enable_database_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"enable_database_management_feature got unknown kwargs: {extra_kwargs!r}") @@ -8273,10 +8272,10 @@ def enable_database_management_feature(self, database_id, enable_database_manage "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 = { @@ -8286,7 +8285,7 @@ def enable_database_management_feature(self, database_id, enable_database_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'), @@ -8386,7 +8385,7 @@ def enable_external_container_database_management_feature(self, external_contain "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_container_database_management_feature got unknown kwargs: {extra_kwargs!r}") @@ -8395,10 +8394,10 @@ def enable_external_container_database_management_feature(self, external_contain "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 = { @@ -8408,7 +8407,7 @@ def enable_external_container_database_management_feature(self, external_contain "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'), @@ -8509,7 +8508,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}") @@ -8518,10 +8517,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 = { @@ -8531,7 +8530,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'), @@ -8632,7 +8631,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}") @@ -8641,10 +8640,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 = { @@ -8654,7 +8653,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'), @@ -8759,7 +8758,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}") @@ -8768,10 +8767,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 = { @@ -8781,7 +8780,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'), @@ -8879,7 +8878,7 @@ def enable_external_my_sql_database_management(self, external_my_sql_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"enable_external_my_sql_database_management got unknown kwargs: {extra_kwargs!r}") @@ -8888,10 +8887,10 @@ def enable_external_my_sql_database_management(self, external_my_sql_database_id "externalMySqlDatabaseId": external_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 = { @@ -8901,7 +8900,7 @@ def enable_external_my_sql_database_management(self, external_my_sql_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'), @@ -9001,7 +9000,7 @@ def enable_external_non_container_database_management_feature(self, external_non "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_non_container_database_management_feature got unknown kwargs: {extra_kwargs!r}") @@ -9010,10 +9009,10 @@ def enable_external_non_container_database_management_feature(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 = { @@ -9023,7 +9022,7 @@ def enable_external_non_container_database_management_feature(self, external_non "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'), @@ -9123,7 +9122,7 @@ def enable_external_pluggable_database_management_feature(self, external_pluggab "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_pluggable_database_management_feature got unknown kwargs: {extra_kwargs!r}") @@ -9132,10 +9131,10 @@ def enable_external_pluggable_database_management_feature(self, external_pluggab "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 = { @@ -9145,7 +9144,7 @@ def enable_external_pluggable_database_management_feature(self, external_pluggab "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'), @@ -9237,7 +9236,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}") @@ -9246,10 +9245,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 = { @@ -9257,7 +9256,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'), @@ -9354,7 +9353,7 @@ def enable_pluggable_database_management_feature(self, pluggable_database_id, 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"enable_pluggable_database_management_feature got unknown kwargs: {extra_kwargs!r}") @@ -9363,10 +9362,10 @@ def enable_pluggable_database_management_feature(self, pluggable_database_id, en "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 = { @@ -9376,7 +9375,7 @@ def enable_pluggable_database_management_feature(self, pluggable_database_id, 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} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9463,7 +9462,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}") @@ -9472,10 +9471,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 = { @@ -9483,7 +9482,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'), @@ -9573,7 +9572,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}") @@ -9582,10 +9581,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 = { @@ -9595,7 +9594,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'), @@ -9729,7 +9728,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}") @@ -9739,10 +9738,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: @@ -9769,7 +9768,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", @@ -9778,7 +9777,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'), @@ -9911,7 +9910,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}") @@ -9921,10 +9920,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: @@ -9944,7 +9943,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", @@ -9953,7 +9952,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'), @@ -10034,7 +10033,7 @@ def get_cloud_asm(self, cloud_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_cloud_asm got unknown kwargs: {extra_kwargs!r}") @@ -10043,10 +10042,10 @@ def get_cloud_asm(self, cloud_asm_id, **kwargs): "cloudAsmId": cloud_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 = { @@ -10054,7 +10053,7 @@ def get_cloud_asm(self, cloud_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'), @@ -10138,7 +10137,7 @@ def get_cloud_asm_configuration(self, cloud_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_cloud_asm_configuration got unknown kwargs: {extra_kwargs!r}") @@ -10147,10 +10146,10 @@ def get_cloud_asm_configuration(self, cloud_asm_id, **kwargs): "cloudAsmId": cloud_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 = { @@ -10159,7 +10158,7 @@ def get_cloud_asm_configuration(self, cloud_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'), @@ -10239,7 +10238,7 @@ def get_cloud_asm_instance(self, cloud_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_cloud_asm_instance got unknown kwargs: {extra_kwargs!r}") @@ -10248,10 +10247,10 @@ def get_cloud_asm_instance(self, cloud_asm_instance_id, **kwargs): "cloudAsmInstanceId": cloud_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 = { @@ -10259,7 +10258,7 @@ def get_cloud_asm_instance(self, cloud_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'), @@ -10339,7 +10338,7 @@ def get_cloud_cluster(self, cloud_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_cluster got unknown kwargs: {extra_kwargs!r}") @@ -10348,10 +10347,10 @@ def get_cloud_cluster(self, cloud_cluster_id, **kwargs): "cloudClusterId": cloud_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 = { @@ -10359,7 +10358,7 @@ def get_cloud_cluster(self, cloud_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'), @@ -10439,7 +10438,7 @@ def get_cloud_cluster_instance(self, cloud_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_cloud_cluster_instance got unknown kwargs: {extra_kwargs!r}") @@ -10448,10 +10447,10 @@ def get_cloud_cluster_instance(self, cloud_cluster_instance_id, **kwargs): "cloudClusterInstanceId": cloud_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 = { @@ -10459,7 +10458,7 @@ def get_cloud_cluster_instance(self, cloud_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'), @@ -10539,7 +10538,7 @@ def get_cloud_db_home(self, cloud_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_cloud_db_home got unknown kwargs: {extra_kwargs!r}") @@ -10548,10 +10547,10 @@ def get_cloud_db_home(self, cloud_db_home_id, **kwargs): "cloudDbHomeId": cloud_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 = { @@ -10559,7 +10558,7 @@ def get_cloud_db_home(self, cloud_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'), @@ -10639,7 +10638,7 @@ def get_cloud_db_node(self, cloud_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_cloud_db_node got unknown kwargs: {extra_kwargs!r}") @@ -10648,10 +10647,10 @@ def get_cloud_db_node(self, cloud_db_node_id, **kwargs): "cloudDbNodeId": cloud_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 = { @@ -10659,7 +10658,7 @@ def get_cloud_db_node(self, cloud_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'), @@ -10739,7 +10738,7 @@ def get_cloud_db_system(self, cloud_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_cloud_db_system got unknown kwargs: {extra_kwargs!r}") @@ -10748,10 +10747,10 @@ def get_cloud_db_system(self, cloud_db_system_id, **kwargs): "cloudDbSystemId": cloud_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 = { @@ -10759,7 +10758,7 @@ def get_cloud_db_system(self, cloud_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'), @@ -10839,7 +10838,7 @@ def get_cloud_db_system_connector(self, cloud_db_system_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_cloud_db_system_connector got unknown kwargs: {extra_kwargs!r}") @@ -10848,10 +10847,10 @@ def get_cloud_db_system_connector(self, cloud_db_system_connector_id, **kwargs): "cloudDbSystemConnectorId": cloud_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 = { @@ -10859,7 +10858,7 @@ def get_cloud_db_system_connector(self, cloud_db_system_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'), @@ -10939,7 +10938,7 @@ def get_cloud_db_system_discovery(self, cloud_db_system_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_cloud_db_system_discovery got unknown kwargs: {extra_kwargs!r}") @@ -10948,10 +10947,10 @@ def get_cloud_db_system_discovery(self, cloud_db_system_discovery_id, **kwargs): "cloudDbSystemDiscoveryId": cloud_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 = { @@ -10959,7 +10958,7 @@ def get_cloud_db_system_discovery(self, cloud_db_system_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'), @@ -11039,7 +11038,7 @@ def get_cloud_listener(self, cloud_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_cloud_listener got unknown kwargs: {extra_kwargs!r}") @@ -11048,10 +11047,10 @@ def get_cloud_listener(self, cloud_listener_id, **kwargs): "cloudListenerId": cloud_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 = { @@ -11059,7 +11058,7 @@ def get_cloud_listener(self, cloud_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'), @@ -11149,7 +11148,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}") @@ -11158,24 +11157,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'), @@ -11332,7 +11331,7 @@ def get_database_fleet_backup_metrics(self, database_hosted_in, start_time, end_ "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_backup_metrics got unknown kwargs: {extra_kwargs!r}") @@ -11373,14 +11372,14 @@ def get_database_fleet_backup_metrics(self, database_hosted_in, start_time, end_ "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'), @@ -11523,7 +11522,7 @@ def get_database_fleet_dataguard_metrics(self, **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"get_database_fleet_dataguard_metrics got unknown kwargs: {extra_kwargs!r}") @@ -11555,14 +11554,14 @@ def get_database_fleet_dataguard_metrics(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'), @@ -11705,7 +11704,7 @@ def get_database_fleet_ha_overview_metrics(self, **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"get_database_fleet_ha_overview_metrics got unknown kwargs: {extra_kwargs!r}") @@ -11737,14 +11736,14 @@ def get_database_fleet_ha_overview_metrics(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'), @@ -11916,7 +11915,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}") @@ -11962,14 +11961,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'), @@ -12051,7 +12050,7 @@ def get_database_ha_backup_details(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_database_ha_backup_details got unknown kwargs: {extra_kwargs!r}") @@ -12060,10 +12059,10 @@ def get_database_ha_backup_details(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 = { @@ -12072,7 +12071,7 @@ def get_database_ha_backup_details(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'), @@ -12160,7 +12159,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}") @@ -12170,14 +12169,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'), @@ -12276,7 +12275,7 @@ def get_dataguard_performance_metrics(self, managed_database_id, start_time, end "peer_database_compartment_id", "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_dataguard_performance_metrics got unknown kwargs: {extra_kwargs!r}") @@ -12285,10 +12284,10 @@ def get_dataguard_performance_metrics(self, managed_database_id, start_time, end "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 = { @@ -12297,14 +12296,14 @@ def get_dataguard_performance_metrics(self, managed_database_id, start_time, end "peerDatabaseCompartmentId": kwargs.get("peer_database_compartment_id", 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'), @@ -12384,7 +12383,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}") @@ -12393,10 +12392,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 = { @@ -12404,7 +12403,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'), @@ -12482,7 +12481,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}") @@ -12491,10 +12490,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 = { @@ -12502,7 +12501,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'), @@ -12586,7 +12585,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}") @@ -12595,10 +12594,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 = { @@ -12607,7 +12606,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'), @@ -12687,7 +12686,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}") @@ -12696,10 +12695,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 = { @@ -12707,7 +12706,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'), @@ -12787,7 +12786,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}") @@ -12796,10 +12795,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 = { @@ -12807,7 +12806,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'), @@ -12887,7 +12886,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}") @@ -12896,10 +12895,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 = { @@ -12907,7 +12906,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'), @@ -12987,7 +12986,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}") @@ -12996,10 +12995,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 = { @@ -13007,7 +13006,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'), @@ -13087,7 +13086,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}") @@ -13096,10 +13095,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 = { @@ -13107,7 +13106,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'), @@ -13187,7 +13186,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}") @@ -13196,10 +13195,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 = { @@ -13207,7 +13206,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'), @@ -13287,7 +13286,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}") @@ -13296,10 +13295,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 = { @@ -13307,7 +13306,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'), @@ -13387,7 +13386,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}") @@ -13396,10 +13395,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 = { @@ -13407,7 +13406,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'), @@ -13488,7 +13487,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}") @@ -13497,10 +13496,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 = { @@ -13508,7 +13507,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'), @@ -13588,7 +13587,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}") @@ -13597,10 +13596,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 = { @@ -13608,7 +13607,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'), @@ -13688,7 +13687,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}") @@ -13697,10 +13696,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 = { @@ -13708,7 +13707,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'), @@ -13788,7 +13787,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}") @@ -13797,10 +13796,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 = { @@ -13808,7 +13807,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'), @@ -13888,7 +13887,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}") @@ -13897,10 +13896,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 = { @@ -13908,7 +13907,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'), @@ -13986,7 +13985,7 @@ def get_external_my_sql_database(self, external_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_external_my_sql_database got unknown kwargs: {extra_kwargs!r}") @@ -13995,10 +13994,10 @@ def get_external_my_sql_database(self, external_my_sql_database_id, **kwargs): "externalMySqlDatabaseId": external_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 = { @@ -14006,7 +14005,7 @@ def get_external_my_sql_database(self, external_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'), @@ -14084,7 +14083,7 @@ def get_external_my_sql_database_connector(self, external_my_sql_database_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_my_sql_database_connector got unknown kwargs: {extra_kwargs!r}") @@ -14093,10 +14092,10 @@ def get_external_my_sql_database_connector(self, external_my_sql_database_connec "externalMySqlDatabaseConnectorId": external_my_sql_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 = { @@ -14104,7 +14103,7 @@ def get_external_my_sql_database_connector(self, external_my_sql_database_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'), @@ -14184,7 +14183,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}") @@ -14193,10 +14192,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 = { @@ -14204,7 +14203,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'), @@ -14282,7 +14281,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}") @@ -14291,10 +14290,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 = { @@ -14302,7 +14301,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'), @@ -14378,7 +14377,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}") @@ -14387,10 +14386,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 = { @@ -14398,7 +14397,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'), @@ -14474,7 +14473,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}") @@ -14483,10 +14482,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 = { @@ -14494,7 +14493,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'), @@ -14572,7 +14571,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}") @@ -14581,10 +14580,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 = { @@ -14592,7 +14591,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'), @@ -14670,7 +14669,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}") @@ -14679,10 +14678,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 = { @@ -14690,7 +14689,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'), @@ -14768,7 +14767,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}") @@ -14777,10 +14776,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 = { @@ -14788,7 +14787,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'), @@ -14868,7 +14867,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}") @@ -14877,10 +14876,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 = { @@ -14888,7 +14887,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'), @@ -14979,7 +14978,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}") @@ -14989,16 +14988,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", @@ -15006,7 +15005,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'), @@ -15096,7 +15095,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}") @@ -15106,16 +15105,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", @@ -15123,7 +15122,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'), @@ -15210,7 +15209,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}") @@ -15220,10 +15219,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 = { @@ -15232,7 +15231,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'), @@ -15337,7 +15336,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}") @@ -15346,10 +15345,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: @@ -15366,14 +15365,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'), @@ -15480,7 +15479,7 @@ def get_peer_database_metrics(self, managed_database_id, start_time, end_time, * "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_peer_database_metrics got unknown kwargs: {extra_kwargs!r}") @@ -15489,10 +15488,10 @@ def get_peer_database_metrics(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') if 'compare_type' in kwargs: @@ -15509,14 +15508,14 @@ def get_peer_database_metrics(self, managed_database_id, start_time, end_time, * "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'), @@ -15599,7 +15598,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}") @@ -15609,10 +15608,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 = { @@ -15620,7 +15619,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'), @@ -15705,7 +15704,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}") @@ -15715,10 +15714,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 = { @@ -15727,7 +15726,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'), @@ -15813,7 +15812,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}") @@ -15822,10 +15821,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 = { @@ -15834,7 +15833,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'), @@ -15921,7 +15920,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}") @@ -15931,10 +15930,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 = { @@ -15943,7 +15942,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'), @@ -16021,7 +16020,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}") @@ -16030,10 +16029,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 = { @@ -16041,7 +16040,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'), @@ -16128,7 +16127,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}") @@ -16138,10 +16137,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 = { @@ -16150,7 +16149,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'), @@ -16228,7 +16227,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}") @@ -16237,10 +16236,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 = { @@ -16248,7 +16247,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'), @@ -16332,7 +16331,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}") @@ -16342,10 +16341,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 = { @@ -16353,7 +16352,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'), @@ -16460,7 +16459,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}") @@ -16469,10 +16468,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: @@ -16496,14 +16495,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'), @@ -16609,7 +16608,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}") @@ -16618,10 +16617,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: @@ -16645,14 +16644,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'), @@ -16796,7 +16795,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}") @@ -16806,10 +16805,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: @@ -16838,7 +16837,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", @@ -16847,7 +16846,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'), @@ -16973,7 +16972,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}") @@ -16982,10 +16981,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: @@ -17011,7 +17010,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", @@ -17020,7 +17019,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'), @@ -17127,7 +17126,7 @@ def list_cloud_asm_disk_groups(self, cloud_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_cloud_asm_disk_groups got unknown kwargs: {extra_kwargs!r}") @@ -17136,10 +17135,10 @@ def list_cloud_asm_disk_groups(self, cloud_asm_id, **kwargs): "cloudAsmId": cloud_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: @@ -17162,7 +17161,7 @@ def list_cloud_asm_disk_groups(self, cloud_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", @@ -17170,7 +17169,7 @@ def list_cloud_asm_disk_groups(self, cloud_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'), @@ -17286,7 +17285,7 @@ def list_cloud_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_cloud_asm_instances got unknown kwargs: {extra_kwargs!r}") @@ -17314,14 +17313,14 @@ def list_cloud_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'), @@ -17427,7 +17426,7 @@ def list_cloud_asm_users(self, cloud_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_cloud_asm_users got unknown kwargs: {extra_kwargs!r}") @@ -17436,10 +17435,10 @@ def list_cloud_asm_users(self, cloud_asm_id, **kwargs): "cloudAsmId": cloud_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: @@ -17462,7 +17461,7 @@ def list_cloud_asm_users(self, cloud_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", @@ -17470,7 +17469,7 @@ def list_cloud_asm_users(self, cloud_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'), @@ -17586,7 +17585,7 @@ def list_cloud_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_cloud_asms got unknown kwargs: {extra_kwargs!r}") @@ -17614,14 +17613,14 @@ def list_cloud_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'), @@ -17735,7 +17734,7 @@ def list_cloud_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_cloud_cluster_instances got unknown kwargs: {extra_kwargs!r}") @@ -17763,14 +17762,14 @@ def list_cloud_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'), @@ -17884,7 +17883,7 @@ def list_cloud_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_cloud_clusters got unknown kwargs: {extra_kwargs!r}") @@ -17912,14 +17911,14 @@ def list_cloud_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'), @@ -18032,7 +18031,7 @@ def list_cloud_databases(self, cloud_db_system_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_cloud_databases got unknown kwargs: {extra_kwargs!r}") @@ -18060,14 +18059,14 @@ def list_cloud_databases(self, cloud_db_system_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'), @@ -18181,7 +18180,7 @@ def list_cloud_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_cloud_db_homes got unknown kwargs: {extra_kwargs!r}") @@ -18209,14 +18208,14 @@ def list_cloud_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'), @@ -18330,7 +18329,7 @@ def list_cloud_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_cloud_db_nodes got unknown kwargs: {extra_kwargs!r}") @@ -18358,14 +18357,14 @@ def list_cloud_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'), @@ -18479,7 +18478,7 @@ def list_cloud_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_cloud_db_system_connectors got unknown kwargs: {extra_kwargs!r}") @@ -18507,14 +18506,14 @@ def list_cloud_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'), @@ -18621,7 +18620,7 @@ def list_cloud_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_cloud_db_system_discoveries got unknown kwargs: {extra_kwargs!r}") @@ -18648,14 +18647,14 @@ def list_cloud_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'), @@ -18780,7 +18779,7 @@ def list_cloud_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_cloud_db_systems got unknown kwargs: {extra_kwargs!r}") @@ -18824,14 +18823,14 @@ def list_cloud_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'), @@ -18943,7 +18942,7 @@ def list_cloud_listener_services(self, cloud_listener_id, 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_cloud_listener_services got unknown kwargs: {extra_kwargs!r}") @@ -18952,10 +18951,10 @@ def list_cloud_listener_services(self, cloud_listener_id, managed_database_id, * "cloudListenerId": cloud_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: @@ -18979,7 +18978,7 @@ def list_cloud_listener_services(self, cloud_listener_id, 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", @@ -18987,7 +18986,7 @@ def list_cloud_listener_services(self, cloud_listener_id, 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'), @@ -19103,7 +19102,7 @@ def list_cloud_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_cloud_listeners got unknown kwargs: {extra_kwargs!r}") @@ -19131,14 +19130,14 @@ def list_cloud_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'), @@ -19251,7 +19250,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}") @@ -19261,10 +19260,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: @@ -19288,7 +19287,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", @@ -19296,7 +19295,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'), @@ -19407,7 +19406,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}") @@ -19416,10 +19415,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: @@ -19443,7 +19442,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", @@ -19451,7 +19450,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'), @@ -19566,7 +19565,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}") @@ -19576,10 +19575,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: @@ -19603,7 +19602,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", @@ -19611,7 +19610,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'), @@ -19725,7 +19724,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}") @@ -19734,10 +19733,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: @@ -19768,7 +19767,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", @@ -19776,7 +19775,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'), @@ -19904,7 +19903,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}") @@ -19942,14 +19941,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'), @@ -20053,7 +20052,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}") @@ -20062,10 +20061,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: @@ -20088,7 +20087,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", @@ -20096,7 +20095,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'), @@ -20212,7 +20211,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}") @@ -20240,14 +20239,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'), @@ -20353,7 +20352,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}") @@ -20362,10 +20361,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: @@ -20388,7 +20387,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", @@ -20396,7 +20395,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'), @@ -20512,7 +20511,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}") @@ -20540,14 +20539,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'), @@ -20661,7 +20660,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}") @@ -20689,14 +20688,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'), @@ -20810,7 +20809,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}") @@ -20838,14 +20837,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'), @@ -20965,7 +20964,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}") @@ -20994,14 +20993,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'), @@ -21115,7 +21114,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}") @@ -21143,14 +21142,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'), @@ -21264,7 +21263,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}") @@ -21292,14 +21291,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'), @@ -21413,7 +21412,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}") @@ -21441,14 +21440,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'), @@ -21555,7 +21554,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}") @@ -21582,14 +21581,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'), @@ -21696,7 +21695,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}") @@ -21723,14 +21722,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'), @@ -21837,7 +21836,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}") @@ -21864,14 +21863,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'), @@ -21983,7 +21982,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}") @@ -22011,14 +22010,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'), @@ -22130,7 +22129,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}") @@ -22158,14 +22157,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'), @@ -22277,7 +22276,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}") @@ -22286,10 +22285,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: @@ -22313,7 +22312,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", @@ -22321,7 +22320,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'), @@ -22437,7 +22436,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}") @@ -22465,14 +22464,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'), @@ -22579,7 +22578,7 @@ def list_external_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_external_my_sql_databases got unknown kwargs: {extra_kwargs!r}") @@ -22606,14 +22605,14 @@ def list_external_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'), @@ -22749,7 +22748,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}") @@ -22782,14 +22781,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'), @@ -22921,7 +22920,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}") @@ -22953,14 +22952,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'), @@ -23090,7 +23089,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}") @@ -23128,14 +23127,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'), @@ -23253,7 +23252,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}") @@ -23289,14 +23288,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'), @@ -23428,7 +23427,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}") @@ -23473,14 +23472,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'), @@ -23591,7 +23590,7 @@ def list_my_sql_database_connectors(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_my_sql_database_connectors got unknown kwargs: {extra_kwargs!r}") @@ -23619,14 +23618,14 @@ def list_my_sql_database_connectors(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'), @@ -23747,7 +23746,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}") @@ -23791,14 +23790,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'), @@ -23911,7 +23910,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}") @@ -23921,10 +23920,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: @@ -23948,7 +23947,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", @@ -23956,7 +23955,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'), @@ -24052,7 +24051,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}") @@ -24061,17 +24060,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", @@ -24079,7 +24078,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'), @@ -24198,7 +24197,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}") @@ -24207,10 +24206,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: @@ -24234,7 +24233,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", @@ -24242,7 +24241,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'), @@ -24376,7 +24375,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}") @@ -24385,10 +24384,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: @@ -24422,7 +24421,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", @@ -24430,7 +24429,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'), @@ -24510,7 +24509,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}") @@ -24519,10 +24518,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 = { @@ -24530,7 +24529,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'), @@ -24641,7 +24640,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}") @@ -24651,10 +24650,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: @@ -24678,7 +24677,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", @@ -24686,7 +24685,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'), @@ -24799,7 +24798,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}") @@ -24809,10 +24808,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: @@ -24836,7 +24835,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", @@ -24844,7 +24843,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'), @@ -24957,7 +24956,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}") @@ -24967,10 +24966,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: @@ -24994,7 +24993,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", @@ -25002,7 +25001,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'), @@ -25113,7 +25112,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}") @@ -25122,10 +25121,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: @@ -25149,7 +25148,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", @@ -25157,7 +25156,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'), @@ -25329,7 +25328,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}") @@ -25338,10 +25337,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: @@ -25384,7 +25383,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", @@ -25392,7 +25391,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'), @@ -25507,7 +25506,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}") @@ -25517,10 +25516,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: @@ -25544,7 +25543,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", @@ -25552,7 +25551,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'), @@ -25637,7 +25636,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}") @@ -25646,10 +25645,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 = { @@ -25658,7 +25657,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'), @@ -25767,7 +25766,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}") @@ -25776,10 +25775,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: @@ -25803,7 +25802,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", @@ -25811,7 +25810,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'), @@ -25922,7 +25921,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}") @@ -25931,10 +25930,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: @@ -25958,7 +25957,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", @@ -25966,7 +25965,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'), @@ -26067,7 +26066,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}") @@ -26076,10 +26075,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: @@ -26102,14 +26101,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'), @@ -26210,7 +26209,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}") @@ -26219,10 +26218,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: @@ -26245,14 +26244,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'), @@ -26371,7 +26370,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}") @@ -26407,14 +26406,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'), @@ -26499,7 +26498,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}") @@ -26508,10 +26507,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 = { @@ -26519,7 +26518,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'), @@ -26604,7 +26603,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}") @@ -26613,10 +26612,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 = { @@ -26624,7 +26623,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'), @@ -26723,7 +26722,7 @@ def modify_autonomous_database_management_feature(self, autonomous_database_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"modify_autonomous_database_management_feature got unknown kwargs: {extra_kwargs!r}") @@ -26732,10 +26731,10 @@ def modify_autonomous_database_management_feature(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 = { @@ -26745,7 +26744,7 @@ def modify_autonomous_database_management_feature(self, autonomous_database_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'), @@ -26845,7 +26844,7 @@ def modify_database_management_feature(self, database_id, modify_database_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"modify_database_management_feature got unknown kwargs: {extra_kwargs!r}") @@ -26854,10 +26853,10 @@ def modify_database_management_feature(self, database_id, modify_database_manage "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 = { @@ -26867,7 +26866,7 @@ def modify_database_management_feature(self, database_id, modify_database_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'), @@ -26967,7 +26966,7 @@ def modify_external_container_database_management_feature(self, external_contain "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_external_container_database_management_feature got unknown kwargs: {extra_kwargs!r}") @@ -26976,10 +26975,10 @@ def modify_external_container_database_management_feature(self, external_contain "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 = { @@ -26989,7 +26988,7 @@ def modify_external_container_database_management_feature(self, external_contain "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'), @@ -27089,7 +27088,7 @@ def modify_pluggable_database_management_feature(self, pluggable_database_id, mo "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_pluggable_database_management_feature got unknown kwargs: {extra_kwargs!r}") @@ -27098,10 +27097,10 @@ def modify_pluggable_database_management_feature(self, pluggable_database_id, mo "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 = { @@ -27111,7 +27110,7 @@ def modify_pluggable_database_management_feature(self, pluggable_database_id, mo "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'), @@ -27203,7 +27202,7 @@ def patch_cloud_db_system_discovery(self, cloud_db_system_discovery_id, patch_cl "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_db_system_discovery got unknown kwargs: {extra_kwargs!r}") @@ -27212,10 +27211,10 @@ def patch_cloud_db_system_discovery(self, cloud_db_system_discovery_id, patch_cl "cloudDbSystemDiscoveryId": cloud_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 = { @@ -27224,7 +27223,7 @@ def patch_cloud_db_system_discovery(self, cloud_db_system_discovery_id, patch_cl "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27315,7 +27314,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}") @@ -27324,10 +27323,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 = { @@ -27336,7 +27335,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'), @@ -27430,7 +27429,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}") @@ -27440,10 +27439,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 = { @@ -27452,7 +27451,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'), @@ -27547,7 +27546,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}") @@ -27556,10 +27555,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 = { @@ -27568,7 +27567,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'), @@ -27658,7 +27657,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}") @@ -27667,10 +27666,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 = { @@ -27679,7 +27678,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'), @@ -27774,7 +27773,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}") @@ -27784,10 +27783,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 = { @@ -27796,7 +27795,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'), @@ -27893,7 +27892,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}") @@ -27902,10 +27901,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 = { @@ -27915,7 +27914,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'), @@ -28066,7 +28065,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}") @@ -28076,10 +28075,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: @@ -28116,7 +28115,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", @@ -28125,7 +28124,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'), @@ -28273,7 +28272,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}") @@ -28283,10 +28282,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: @@ -28316,7 +28315,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", @@ -28325,7 +28324,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'), @@ -28477,7 +28476,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}") @@ -28487,10 +28486,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: @@ -28520,7 +28519,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", @@ -28529,7 +28528,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'), @@ -28710,7 +28709,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}") @@ -28720,10 +28719,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: @@ -28778,7 +28777,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", @@ -28787,7 +28786,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'), @@ -28913,7 +28912,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}") @@ -28922,10 +28921,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: @@ -28951,7 +28950,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", @@ -28960,7 +28959,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'), @@ -29108,7 +29107,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}") @@ -29118,10 +29117,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: @@ -29151,7 +29150,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", @@ -29160,7 +29159,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'), @@ -29306,7 +29305,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}") @@ -29316,10 +29315,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: @@ -29355,7 +29354,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", @@ -29364,7 +29363,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'), @@ -29524,7 +29523,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}") @@ -29534,10 +29533,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: @@ -29570,7 +29569,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", @@ -29579,7 +29578,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'), @@ -29734,7 +29733,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}") @@ -29744,10 +29743,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: @@ -29785,7 +29784,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", @@ -29794,7 +29793,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'), @@ -29896,7 +29895,7 @@ def summarize_cloud_asm_metrics(self, cloud_asm_id, start_time, end_time, **kwar "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_cloud_asm_metrics got unknown kwargs: {extra_kwargs!r}") @@ -29905,10 +29904,10 @@ def summarize_cloud_asm_metrics(self, cloud_asm_id, start_time, end_time, **kwar "cloudAsmId": cloud_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 = { @@ -29918,14 +29917,14 @@ def summarize_cloud_asm_metrics(self, cloud_asm_id, start_time, end_time, **kwar "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'), @@ -30028,7 +30027,7 @@ def summarize_cloud_cluster_metrics(self, cloud_cluster_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_cloud_cluster_metrics got unknown kwargs: {extra_kwargs!r}") @@ -30037,10 +30036,10 @@ def summarize_cloud_cluster_metrics(self, cloud_cluster_id, start_time, end_time "cloudClusterId": cloud_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 = { @@ -30050,14 +30049,14 @@ def summarize_cloud_cluster_metrics(self, cloud_cluster_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'), @@ -30160,7 +30159,7 @@ def summarize_cloud_db_node_metrics(self, cloud_db_node_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_cloud_db_node_metrics got unknown kwargs: {extra_kwargs!r}") @@ -30169,10 +30168,10 @@ def summarize_cloud_db_node_metrics(self, cloud_db_node_id, start_time, end_time "cloudDbNodeId": cloud_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 = { @@ -30182,14 +30181,14 @@ def summarize_cloud_db_node_metrics(self, cloud_db_node_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'), @@ -30292,7 +30291,7 @@ def summarize_cloud_db_system_availability_metrics(self, cloud_db_system_id, sta "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_cloud_db_system_availability_metrics got unknown kwargs: {extra_kwargs!r}") @@ -30301,10 +30300,10 @@ def summarize_cloud_db_system_availability_metrics(self, cloud_db_system_id, sta "cloudDbSystemId": cloud_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 = { @@ -30314,14 +30313,14 @@ def summarize_cloud_db_system_availability_metrics(self, cloud_db_system_id, sta "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'), @@ -30424,7 +30423,7 @@ def summarize_cloud_listener_metrics(self, cloud_listener_id, start_time, end_ti "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_cloud_listener_metrics got unknown kwargs: {extra_kwargs!r}") @@ -30433,10 +30432,10 @@ def summarize_cloud_listener_metrics(self, cloud_listener_id, start_time, end_ti "cloudListenerId": cloud_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 = { @@ -30446,14 +30445,14 @@ def summarize_cloud_listener_metrics(self, cloud_listener_id, start_time, end_ti "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'), @@ -30556,7 +30555,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}") @@ -30565,10 +30564,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 = { @@ -30578,14 +30577,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'), @@ -30688,7 +30687,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}") @@ -30697,10 +30696,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 = { @@ -30710,14 +30709,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'), @@ -30820,7 +30819,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}") @@ -30829,10 +30828,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 = { @@ -30842,14 +30841,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'), @@ -30952,7 +30951,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}") @@ -30961,10 +30960,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 = { @@ -30974,14 +30973,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'), @@ -31084,7 +31083,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}") @@ -31093,10 +31092,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 = { @@ -31106,14 +31105,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'), @@ -31237,7 +31236,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}") @@ -31267,14 +31266,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'), @@ -31370,7 +31369,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}") @@ -31379,10 +31378,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 = { @@ -31391,14 +31390,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'), @@ -31489,7 +31488,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}") @@ -31498,16 +31497,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", @@ -31515,7 +31514,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'), @@ -31606,7 +31605,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}") @@ -31615,16 +31614,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", @@ -31632,7 +31631,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'), @@ -31719,7 +31718,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}") @@ -31728,10 +31727,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 = { @@ -31739,7 +31738,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'), @@ -31826,7 +31825,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}") @@ -31836,10 +31835,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 = { @@ -31847,7 +31846,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'), @@ -31938,7 +31937,7 @@ def update_cloud_asm(self, cloud_asm_id, update_cloud_asm_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_cloud_asm got unknown kwargs: {extra_kwargs!r}") @@ -31947,10 +31946,10 @@ def update_cloud_asm(self, cloud_asm_id, update_cloud_asm_details, **kwargs): "cloudAsmId": cloud_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 = { @@ -31959,7 +31958,7 @@ def update_cloud_asm(self, cloud_asm_id, update_cloud_asm_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'), @@ -32048,7 +32047,7 @@ def update_cloud_asm_instance(self, cloud_asm_instance_id, update_cloud_asm_inst "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_asm_instance got unknown kwargs: {extra_kwargs!r}") @@ -32057,10 +32056,10 @@ def update_cloud_asm_instance(self, cloud_asm_instance_id, update_cloud_asm_inst "cloudAsmInstanceId": cloud_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 = { @@ -32069,7 +32068,7 @@ def update_cloud_asm_instance(self, cloud_asm_instance_id, update_cloud_asm_inst "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32160,7 +32159,7 @@ def update_cloud_cluster(self, cloud_cluster_id, update_cloud_cluster_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_cloud_cluster got unknown kwargs: {extra_kwargs!r}") @@ -32169,10 +32168,10 @@ def update_cloud_cluster(self, cloud_cluster_id, update_cloud_cluster_details, * "cloudClusterId": cloud_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 = { @@ -32181,7 +32180,7 @@ def update_cloud_cluster(self, cloud_cluster_id, update_cloud_cluster_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'), @@ -32270,7 +32269,7 @@ def update_cloud_cluster_instance(self, cloud_cluster_instance_id, update_cloud_ "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_cluster_instance got unknown kwargs: {extra_kwargs!r}") @@ -32279,10 +32278,10 @@ def update_cloud_cluster_instance(self, cloud_cluster_instance_id, update_cloud_ "cloudClusterInstanceId": cloud_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 = { @@ -32291,7 +32290,7 @@ def update_cloud_cluster_instance(self, cloud_cluster_instance_id, update_cloud_ "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -32380,7 +32379,7 @@ def update_cloud_db_home(self, cloud_db_home_id, update_cloud_db_home_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_cloud_db_home got unknown kwargs: {extra_kwargs!r}") @@ -32389,10 +32388,10 @@ def update_cloud_db_home(self, cloud_db_home_id, update_cloud_db_home_details, * "cloudDbHomeId": cloud_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 = { @@ -32401,7 +32400,7 @@ def update_cloud_db_home(self, cloud_db_home_id, update_cloud_db_home_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'), @@ -32492,7 +32491,7 @@ def update_cloud_db_node(self, cloud_db_node_id, update_cloud_db_node_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_cloud_db_node got unknown kwargs: {extra_kwargs!r}") @@ -32501,10 +32500,10 @@ def update_cloud_db_node(self, cloud_db_node_id, update_cloud_db_node_details, * "cloudDbNodeId": cloud_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 = { @@ -32513,7 +32512,7 @@ def update_cloud_db_node(self, cloud_db_node_id, update_cloud_db_node_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'), @@ -32602,7 +32601,7 @@ def update_cloud_db_system(self, cloud_db_system_id, update_cloud_db_system_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_cloud_db_system got unknown kwargs: {extra_kwargs!r}") @@ -32611,10 +32610,10 @@ def update_cloud_db_system(self, cloud_db_system_id, update_cloud_db_system_deta "cloudDbSystemId": cloud_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 = { @@ -32623,7 +32622,7 @@ def update_cloud_db_system(self, cloud_db_system_id, update_cloud_db_system_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'), @@ -32714,7 +32713,7 @@ def update_cloud_db_system_connector(self, cloud_db_system_connector_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_cloud_db_system_connector got unknown kwargs: {extra_kwargs!r}") @@ -32723,10 +32722,10 @@ def update_cloud_db_system_connector(self, cloud_db_system_connector_id, update_ "cloudDbSystemConnectorId": cloud_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 = { @@ -32735,7 +32734,7 @@ def update_cloud_db_system_connector(self, cloud_db_system_connector_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'), @@ -32824,7 +32823,7 @@ def update_cloud_db_system_discovery(self, cloud_db_system_discovery_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_cloud_db_system_discovery got unknown kwargs: {extra_kwargs!r}") @@ -32833,10 +32832,10 @@ def update_cloud_db_system_discovery(self, cloud_db_system_discovery_id, update_ "cloudDbSystemDiscoveryId": cloud_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 = { @@ -32845,7 +32844,7 @@ def update_cloud_db_system_discovery(self, cloud_db_system_discovery_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'), @@ -32936,7 +32935,7 @@ def update_cloud_listener(self, cloud_listener_id, update_cloud_listener_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_cloud_listener got unknown kwargs: {extra_kwargs!r}") @@ -32945,10 +32944,10 @@ def update_cloud_listener(self, cloud_listener_id, update_cloud_listener_details "cloudListenerId": cloud_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 = { @@ -32957,7 +32956,7 @@ def update_cloud_listener(self, cloud_listener_id, update_cloud_listener_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'), @@ -33046,7 +33045,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}") @@ -33055,10 +33054,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 = { @@ -33067,7 +33066,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'), @@ -33158,7 +33157,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}") @@ -33167,10 +33166,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 = { @@ -33179,7 +33178,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'), @@ -33268,7 +33267,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}") @@ -33277,10 +33276,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 = { @@ -33289,7 +33288,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'), @@ -33380,7 +33379,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}") @@ -33389,10 +33388,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 = { @@ -33401,7 +33400,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'), @@ -33490,7 +33489,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}") @@ -33499,10 +33498,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 = { @@ -33511,7 +33510,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'), @@ -33600,7 +33599,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}") @@ -33609,10 +33608,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 = { @@ -33621,7 +33620,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'), @@ -33712,7 +33711,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}") @@ -33721,10 +33720,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 = { @@ -33733,7 +33732,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'), @@ -33822,7 +33821,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}") @@ -33831,10 +33830,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 = { @@ -33843,7 +33842,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'), @@ -33934,7 +33933,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}") @@ -33943,10 +33942,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 = { @@ -33955,7 +33954,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'), @@ -34044,7 +34043,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}") @@ -34053,10 +34052,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 = { @@ -34065,7 +34064,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'), @@ -34164,7 +34163,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}") @@ -34173,10 +34172,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 = { @@ -34186,7 +34185,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'), @@ -34280,7 +34279,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}") @@ -34289,10 +34288,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 = { @@ -34301,7 +34300,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'), @@ -34392,7 +34391,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}") @@ -34401,10 +34400,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 = { @@ -34413,7 +34412,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'), @@ -34504,7 +34503,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}") @@ -34513,10 +34512,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 = { @@ -34525,7 +34524,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'), @@ -34616,7 +34615,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}") @@ -34625,10 +34624,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 = { @@ -34637,7 +34636,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'), @@ -34724,7 +34723,7 @@ def update_external_mysql_database(self, external_my_sql_database_id, update_ext "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_mysql_database got unknown kwargs: {extra_kwargs!r}") @@ -34733,10 +34732,10 @@ def update_external_mysql_database(self, external_my_sql_database_id, update_ext "externalMySqlDatabaseId": external_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 = { @@ -34745,7 +34744,7 @@ def update_external_mysql_database(self, external_my_sql_database_id, update_ext "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -34834,7 +34833,7 @@ def update_external_mysql_database_connector(self, external_my_sql_database_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_external_mysql_database_connector got unknown kwargs: {extra_kwargs!r}") @@ -34843,10 +34842,10 @@ def update_external_mysql_database_connector(self, external_my_sql_database_conn "externalMySqlDatabaseConnectorId": external_my_sql_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 = { @@ -34855,7 +34854,7 @@ def update_external_mysql_database_connector(self, external_my_sql_database_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'), @@ -34944,7 +34943,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}") @@ -34953,10 +34952,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 = { @@ -34965,7 +34964,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'), @@ -35056,7 +35055,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}") @@ -35065,10 +35064,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 = { @@ -35077,7 +35076,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'), @@ -35168,7 +35167,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}") @@ -35177,10 +35176,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 = { @@ -35189,7 +35188,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'), @@ -35280,7 +35279,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}") @@ -35289,10 +35288,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 = { @@ -35301,7 +35300,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'), @@ -35395,7 +35394,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}") @@ -35405,10 +35404,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 = { @@ -35417,7 +35416,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'), @@ -35503,7 +35502,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}") @@ -35513,10 +35512,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 = { @@ -35524,7 +35523,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 2570b137ba..27ea8276cb 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 @@ -217,7 +216,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}") @@ -226,10 +225,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: @@ -272,7 +271,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", @@ -280,7 +279,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'), @@ -413,7 +412,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}") @@ -422,10 +421,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: @@ -468,7 +467,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", @@ -476,7 +475,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'), @@ -603,7 +602,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}") @@ -612,10 +611,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: @@ -650,7 +649,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", @@ -658,7 +657,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'), @@ -785,7 +784,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}") @@ -794,10 +793,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: @@ -832,7 +831,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", @@ -840,7 +839,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 5902221eb9..72dd233c2f 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 @@ -182,7 +181,7 @@ def change_mysql_database_management_type(self, managed_my_sql_database_id, chan "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_mysql_database_management_type got unknown kwargs: {extra_kwargs!r}") @@ -191,10 +190,10 @@ def change_mysql_database_management_type(self, managed_my_sql_database_id, chan "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 = { @@ -204,7 +203,7 @@ def change_mysql_database_management_type(self, managed_my_sql_database_id, chan "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 get_binary_log_information(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_binary_log_information got unknown kwargs: {extra_kwargs!r}") @@ -292,10 +291,10 @@ def get_binary_log_information(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 = { @@ -303,7 +302,7 @@ def get_binary_log_information(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'), @@ -381,7 +380,7 @@ def get_general_replication_information(self, managed_my_sql_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_general_replication_information got unknown kwargs: {extra_kwargs!r}") @@ -390,10 +389,10 @@ def get_general_replication_information(self, managed_my_sql_database_id, **kwar "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 = { @@ -401,7 +400,7 @@ def get_general_replication_information(self, managed_my_sql_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'), @@ -507,7 +506,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}") @@ -528,14 +527,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'), @@ -611,7 +610,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}") @@ -620,10 +619,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 = { @@ -631,7 +630,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'), @@ -753,7 +752,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}") @@ -798,14 +797,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'), @@ -884,7 +883,7 @@ def get_my_sql_query_details(self, managed_my_sql_database_id, digest, **kwargs) "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_query_details got unknown kwargs: {extra_kwargs!r}") @@ -893,23 +892,23 @@ def get_my_sql_query_details(self, managed_my_sql_database_id, digest, **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') query_params = { "digest": digest } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 list_high_availability_members(self, managed_my_sql_database_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_high_availability_members got unknown kwargs: {extra_kwargs!r}") @@ -1022,10 +1021,10 @@ def list_high_availability_members(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') if 'sort_order' in kwargs: @@ -1048,14 +1047,14 @@ def list_high_availability_members(self, managed_my_sql_database_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1159,7 +1158,7 @@ def list_inbound_replications(self, managed_my_sql_database_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_inbound_replications got unknown kwargs: {extra_kwargs!r}") @@ -1168,10 +1167,10 @@ def list_inbound_replications(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') if 'sort_order' in kwargs: @@ -1194,14 +1193,14 @@ def list_inbound_replications(self, managed_my_sql_database_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1304,7 +1303,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}") @@ -1313,10 +1312,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: @@ -1339,14 +1338,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'), @@ -1475,7 +1474,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}") @@ -1484,10 +1483,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: @@ -1513,14 +1512,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'), @@ -1631,7 +1630,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}") @@ -1665,14 +1664,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'), @@ -1774,7 +1773,7 @@ def list_my_sql_digest_errors(self, managed_my_sql_database_id, digest, **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_my_sql_digest_errors got unknown kwargs: {extra_kwargs!r}") @@ -1783,10 +1782,10 @@ def list_my_sql_digest_errors(self, managed_my_sql_database_id, digest, **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') if 'sort_by' in kwargs: @@ -1810,14 +1809,14 @@ def list_my_sql_digest_errors(self, managed_my_sql_database_id, digest, **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'), @@ -1921,7 +1920,7 @@ def list_outbound_replications(self, managed_my_sql_database_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_outbound_replications got unknown kwargs: {extra_kwargs!r}") @@ -1930,10 +1929,10 @@ def list_outbound_replications(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') if 'sort_order' in kwargs: @@ -1956,14 +1955,14 @@ def list_outbound_replications(self, managed_my_sql_database_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2060,7 +2059,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}") @@ -2069,10 +2068,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 = { @@ -2081,14 +2080,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 f45688ea7c..b4cdc46b6c 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 @@ -171,7 +170,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}") @@ -180,10 +179,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 = { @@ -192,7 +191,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 3011a523c1..b76a1a691a 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 @@ -175,7 +174,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}") @@ -184,10 +183,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 = { @@ -196,7 +195,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'), @@ -288,7 +287,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}") @@ -297,10 +296,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 = { @@ -309,7 +308,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'), @@ -406,7 +405,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}") @@ -416,10 +415,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 = { @@ -428,7 +427,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'), @@ -522,7 +521,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}") @@ -531,10 +530,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 = { @@ -543,7 +542,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'), @@ -637,7 +636,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}") @@ -647,10 +646,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 = { @@ -659,7 +658,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'), @@ -756,7 +755,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}") @@ -766,10 +765,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 = { @@ -778,7 +777,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'), @@ -882,7 +881,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}") @@ -892,17 +891,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", @@ -910,7 +909,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'), @@ -1009,7 +1008,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}") @@ -1019,10 +1018,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"] @@ -1035,7 +1034,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", @@ -1043,7 +1042,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'), @@ -1154,7 +1153,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}") @@ -1164,10 +1163,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: @@ -1184,7 +1183,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", @@ -1192,7 +1191,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'), @@ -1331,7 +1330,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}") @@ -1341,10 +1340,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: @@ -1387,7 +1386,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", @@ -1395,7 +1394,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'), @@ -1516,7 +1515,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}") @@ -1526,10 +1525,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: @@ -1554,7 +1553,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", @@ -1562,7 +1561,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'), @@ -1685,7 +1684,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}") @@ -1694,10 +1693,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: @@ -1731,7 +1730,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", @@ -1739,7 +1738,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'), @@ -1852,7 +1851,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}") @@ -1861,10 +1860,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: @@ -1889,7 +1888,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", @@ -1897,7 +1896,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'), @@ -1991,7 +1990,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}") @@ -2001,10 +2000,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 = { @@ -2013,7 +2012,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'), @@ -2110,7 +2109,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}") @@ -2120,10 +2119,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 = { @@ -2132,7 +2131,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'), @@ -2226,7 +2225,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}") @@ -2235,10 +2234,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 = { @@ -2247,7 +2246,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'), @@ -2342,7 +2341,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}") @@ -2352,10 +2351,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 = { @@ -2364,7 +2363,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 02b7f9a61f..0015bac927 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 @@ -177,7 +176,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}") @@ -186,10 +185,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 = { @@ -199,7 +198,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'), @@ -290,7 +289,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}") @@ -299,10 +298,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 = { @@ -311,7 +310,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'), @@ -409,7 +408,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}") @@ -418,10 +417,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 = { @@ -431,7 +430,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'), @@ -530,7 +529,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}") @@ -539,10 +538,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 = { @@ -552,7 +551,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'), @@ -651,7 +650,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}") @@ -660,10 +659,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 = { @@ -673,7 +672,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'), @@ -766,7 +765,7 @@ def collect_traces(self, job_id, collect_traces_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"collect_traces got unknown kwargs: {extra_kwargs!r}") @@ -775,10 +774,10 @@ def collect_traces(self, job_id, collect_traces_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 = { @@ -787,7 +786,7 @@ def collect_traces(self, job_id, collect_traces_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'), @@ -884,7 +883,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}") @@ -893,10 +892,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 = { @@ -906,7 +905,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'), @@ -995,7 +994,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}") @@ -1006,7 +1005,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'), @@ -1096,7 +1095,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}") @@ -1107,7 +1106,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'), @@ -1206,7 +1205,7 @@ def create_parameter_file_version(self, job_id, create_parameter_file_version_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_parameter_file_version got unknown kwargs: {extra_kwargs!r}") @@ -1215,10 +1214,10 @@ def create_parameter_file_version(self, job_id, create_parameter_file_version_de "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 = { @@ -1228,7 +1227,7 @@ def create_parameter_file_version(self, job_id, create_parameter_file_version_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'), @@ -1316,7 +1315,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}") @@ -1325,10 +1324,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 = { @@ -1337,7 +1336,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'), @@ -1422,7 +1421,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}") @@ -1431,10 +1430,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 = { @@ -1443,7 +1442,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'), @@ -1528,7 +1527,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}") @@ -1537,10 +1536,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 = { @@ -1549,7 +1548,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'), @@ -1637,7 +1636,7 @@ def delete_parameter_file_version(self, job_id, parameter_file_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_parameter_file_version got unknown kwargs: {extra_kwargs!r}") @@ -1647,10 +1646,10 @@ def delete_parameter_file_version(self, job_id, parameter_file_name, **kwargs): "parameterFileName": parameter_file_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 delete_parameter_file_version(self, job_id, parameter_file_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'), @@ -1752,7 +1751,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}") @@ -1761,10 +1760,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 = { @@ -1774,7 +1773,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'), @@ -1854,7 +1853,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}") @@ -1863,10 +1862,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 = { @@ -1874,7 +1873,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'), @@ -1953,7 +1952,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}") @@ -1962,10 +1961,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 = { @@ -1973,7 +1972,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'), @@ -2052,7 +2051,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}") @@ -2061,10 +2060,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 = { @@ -2072,7 +2071,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'), @@ -2151,7 +2150,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}") @@ -2160,10 +2159,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 = { @@ -2171,7 +2170,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'), @@ -2258,7 +2257,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}") @@ -2267,10 +2266,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 = { @@ -2279,7 +2278,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'), @@ -2362,7 +2361,7 @@ def get_parameter_file_version(self, parameter_file_name, 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_parameter_file_version got unknown kwargs: {extra_kwargs!r}") @@ -2372,10 +2371,10 @@ def get_parameter_file_version(self, parameter_file_name, 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 = { @@ -2383,7 +2382,7 @@ def get_parameter_file_version(self, parameter_file_name, 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'), @@ -2462,7 +2461,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}") @@ -2471,10 +2470,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 = { @@ -2482,7 +2481,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'), @@ -2608,7 +2607,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}") @@ -2662,14 +2661,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'), @@ -2800,7 +2799,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}") @@ -2809,10 +2808,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: @@ -2849,14 +2848,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'), @@ -2945,7 +2944,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}") @@ -2954,24 +2953,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'), @@ -3084,7 +3083,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}") @@ -3119,14 +3118,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'), @@ -3228,7 +3227,7 @@ def list_migration_object_types(self, connection_type, **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}") @@ -3260,14 +3259,14 @@ def list_migration_object_types(self, connection_type, **kwargs): "page": kwargs.get("page", missing), "connectionType": connection_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'), @@ -3362,7 +3361,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}") @@ -3371,17 +3370,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", @@ -3389,7 +3388,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'), @@ -3500,7 +3499,7 @@ def list_migration_parameters(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_migration_parameters got unknown kwargs: {extra_kwargs!r}") @@ -3541,14 +3540,14 @@ def list_migration_parameters(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'), @@ -3664,7 +3663,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}") @@ -3707,14 +3706,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'), @@ -3820,7 +3819,7 @@ def list_parameter_file_versions(self, job_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_parameter_file_versions got unknown kwargs: {extra_kwargs!r}") @@ -3829,10 +3828,10 @@ def list_parameter_file_versions(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_by' in kwargs: @@ -3856,14 +3855,14 @@ def list_parameter_file_versions(self, job_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'), @@ -3964,7 +3963,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}") @@ -3973,10 +3972,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: @@ -3999,14 +3998,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'), @@ -4107,7 +4106,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}") @@ -4116,10 +4115,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: @@ -4142,14 +4141,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'), @@ -4262,7 +4261,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}") @@ -4297,14 +4296,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'), @@ -4402,7 +4401,7 @@ def make_current_parameter_file_version(self, job_id, parameter_file_name, **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"make_current_parameter_file_version got unknown kwargs: {extra_kwargs!r}") @@ -4412,10 +4411,10 @@ def make_current_parameter_file_version(self, job_id, parameter_file_name, **kwa "parameterFileName": parameter_file_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 make_current_parameter_file_version(self, job_id, parameter_file_name, **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'), @@ -4516,7 +4515,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}") @@ -4525,10 +4524,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 = { @@ -4537,7 +4536,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'), @@ -4636,7 +4635,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}") @@ -4645,10 +4644,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 = { @@ -4658,7 +4657,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'), @@ -4740,7 +4739,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}") @@ -4749,10 +4748,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 = { @@ -4760,7 +4759,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'), @@ -4859,7 +4858,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}") @@ -4868,10 +4867,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 = { @@ -4881,7 +4880,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'), @@ -4979,7 +4978,7 @@ def suspend_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"suspend_job got unknown kwargs: {extra_kwargs!r}") @@ -4988,10 +4987,10 @@ def suspend_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 = { @@ -5001,7 +5000,7 @@ def suspend_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'), @@ -5092,7 +5091,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}") @@ -5101,10 +5100,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 = { @@ -5113,7 +5112,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'), @@ -5203,7 +5202,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}") @@ -5212,10 +5211,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 = { @@ -5224,7 +5223,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'), @@ -5316,7 +5315,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}") @@ -5325,10 +5324,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 = { @@ -5337,7 +5336,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 e8e9d4ffb6..27dcdbafa2 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 @@ -172,7 +171,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}") @@ -181,10 +180,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 = { @@ -193,7 +192,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'), @@ -283,7 +282,7 @@ def add_database_tools_identity_lock(self, database_tools_identity_id, add_resou "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_identity_lock got unknown kwargs: {extra_kwargs!r}") @@ -292,10 +291,10 @@ def add_database_tools_identity_lock(self, database_tools_identity_id, add_resou "databaseToolsIdentityId": database_tools_identity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 add_database_tools_identity_lock(self, database_tools_identity_id, add_resou "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -403,10 +402,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 = { @@ -415,7 +414,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'), @@ -514,7 +513,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}") @@ -523,16 +522,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", @@ -540,7 +539,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'), @@ -639,7 +638,7 @@ def change_database_tools_identity_compartment(self, database_tools_identity_id, "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_identity_compartment got unknown kwargs: {extra_kwargs!r}") @@ -648,16 +647,16 @@ def change_database_tools_identity_compartment(self, database_tools_identity_id, "databaseToolsIdentityId": database_tools_identity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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", @@ -665,7 +664,7 @@ def change_database_tools_identity_compartment(self, database_tools_identity_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'), @@ -764,7 +763,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}") @@ -773,16 +772,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", @@ -790,7 +789,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'), @@ -878,7 +877,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}") @@ -889,7 +888,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'), @@ -978,7 +977,7 @@ def create_database_tools_identity(self, create_database_tools_identity_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_database_tools_identity got unknown kwargs: {extra_kwargs!r}") @@ -989,7 +988,7 @@ def create_database_tools_identity(self, create_database_tools_identity_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'), @@ -1078,7 +1077,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}") @@ -1089,7 +1088,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'), @@ -1182,7 +1181,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}") @@ -1191,16 +1190,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", @@ -1208,7 +1207,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'), @@ -1298,7 +1297,7 @@ def delete_database_tools_identity(self, database_tools_identity_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_database_tools_identity got unknown kwargs: {extra_kwargs!r}") @@ -1307,16 +1306,16 @@ def delete_database_tools_identity(self, database_tools_identity_id, **kwargs): "databaseToolsIdentityId": database_tools_identity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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", @@ -1324,7 +1323,7 @@ def delete_database_tools_identity(self, database_tools_identity_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_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}") @@ -1423,16 +1422,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", @@ -1440,7 +1439,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'), @@ -1518,7 +1517,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}") @@ -1527,10 +1526,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 = { @@ -1538,7 +1537,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'), @@ -1618,7 +1617,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}") @@ -1627,10 +1626,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 = { @@ -1638,7 +1637,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'), @@ -1718,7 +1717,7 @@ def get_database_tools_identity(self, database_tools_identity_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_identity got unknown kwargs: {extra_kwargs!r}") @@ -1727,10 +1726,10 @@ def get_database_tools_identity(self, database_tools_identity_id, **kwargs): "databaseToolsIdentityId": database_tools_identity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1738,7 +1737,7 @@ def get_database_tools_identity(self, database_tools_identity_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -1827,10 +1826,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 = { @@ -1838,7 +1837,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'), @@ -1918,7 +1917,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}") @@ -1927,10 +1926,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 = { @@ -1938,7 +1937,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'), @@ -2072,7 +2071,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}") @@ -2135,14 +2134,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'), @@ -2256,7 +2255,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}") @@ -2292,14 +2291,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'), @@ -2419,7 +2418,7 @@ def list_database_tools_identities(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_database_tools_identities got unknown kwargs: {extra_kwargs!r}") @@ -2464,14 +2463,14 @@ def list_database_tools_identities(self, compartment_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "type": self.base_client.generate_collection_format_param(kwargs.get("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'), @@ -2589,7 +2588,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}") @@ -2626,14 +2625,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'), @@ -2733,7 +2732,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}") @@ -2742,10 +2741,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: @@ -2768,14 +2767,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'), @@ -2877,7 +2876,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}") @@ -2886,10 +2885,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: @@ -2912,14 +2911,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'), @@ -3027,7 +3026,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}") @@ -3054,14 +3053,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'), @@ -3152,7 +3151,7 @@ def refresh_database_tools_identity_credential(self, database_tools_identity_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"refresh_database_tools_identity_credential got unknown kwargs: {extra_kwargs!r}") @@ -3161,10 +3160,10 @@ def refresh_database_tools_identity_credential(self, database_tools_identity_id, "databaseToolsIdentityId": database_tools_identity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3173,7 +3172,7 @@ def refresh_database_tools_identity_credential(self, database_tools_identity_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'), @@ -3261,7 +3260,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}") @@ -3270,10 +3269,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 = { @@ -3282,7 +3281,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'), @@ -3372,7 +3371,7 @@ def remove_database_tools_identity_lock(self, database_tools_identity_id, remove "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_identity_lock got unknown kwargs: {extra_kwargs!r}") @@ -3381,10 +3380,10 @@ def remove_database_tools_identity_lock(self, database_tools_identity_id, remove "databaseToolsIdentityId": database_tools_identity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3393,7 +3392,7 @@ def remove_database_tools_identity_lock(self, database_tools_identity_id, remove "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3483,7 +3482,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}") @@ -3492,10 +3491,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 = { @@ -3504,7 +3503,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'), @@ -3599,7 +3598,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}") @@ -3608,16 +3607,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", @@ -3625,7 +3624,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'), @@ -3720,7 +3719,7 @@ def update_database_tools_identity(self, database_tools_identity_id, update_data "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_identity got unknown kwargs: {extra_kwargs!r}") @@ -3729,16 +3728,16 @@ def update_database_tools_identity(self, database_tools_identity_id, update_data "databaseToolsIdentityId": database_tools_identity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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", @@ -3746,7 +3745,7 @@ def update_database_tools_identity(self, database_tools_identity_id, update_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'), @@ -3841,7 +3840,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}") @@ -3850,16 +3849,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", @@ -3867,7 +3866,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'), @@ -3958,7 +3957,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}") @@ -3967,10 +3966,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 = { @@ -3979,7 +3978,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'), @@ -4071,7 +4070,7 @@ def validate_database_tools_identity_credential(self, database_tools_identity_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"validate_database_tools_identity_credential got unknown kwargs: {extra_kwargs!r}") @@ -4080,10 +4079,10 @@ def validate_database_tools_identity_credential(self, database_tools_identity_id "databaseToolsIdentityId": database_tools_identity_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4092,7 +4091,7 @@ def validate_database_tools_identity_credential(self, database_tools_identity_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'), diff --git a/src/oci/dblm/db_life_cycle_management_client.py b/src/oci/dblm/db_life_cycle_management_client.py index 5baf24121f..408b73ca5d 100644 --- a/src/oci/dblm/db_life_cycle_management_client.py +++ b/src/oci/dblm/db_life_cycle_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_vulnerability_scan(self, create_vulnerability_scan_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_vulnerability_scan got unknown kwargs: {extra_kwargs!r}") @@ -179,7 +178,7 @@ def create_vulnerability_scan(self, create_vulnerability_scan_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'), @@ -276,7 +275,7 @@ def get_patch_management(self, compartment_id, **kwargs): "time_started_greater_than_or_equal_to", "time_started_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_patch_management got unknown kwargs: {extra_kwargs!r}") @@ -295,14 +294,14 @@ def get_patch_management(self, compartment_id, **kwargs): "timeStartedGreaterThanOrEqualTo": kwargs.get("time_started_greater_than_or_equal_to", missing), "timeStartedLessThan": kwargs.get("time_started_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'), @@ -390,7 +389,7 @@ def get_vulnerability(self, compartment_id, **kwargs): "database_release", "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"get_vulnerability got unknown kwargs: {extra_kwargs!r}") @@ -407,14 +406,14 @@ def get_vulnerability(self, compartment_id, **kwargs): "databaseRelease": kwargs.get("database_release", 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'), @@ -494,7 +493,7 @@ def get_vulnerability_scan(self, vulnerability_scan_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_scan got unknown kwargs: {extra_kwargs!r}") @@ -503,10 +502,10 @@ def get_vulnerability_scan(self, vulnerability_scan_id, **kwargs): "vulnerabilityScanId": vulnerability_scan_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -514,7 +513,7 @@ def get_vulnerability_scan(self, vulnerability_scan_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -592,7 +591,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}") @@ -601,10 +600,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 = { @@ -612,7 +611,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'), @@ -717,7 +716,7 @@ def list_aggregated_vulnerability_data(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_aggregated_vulnerability_data got unknown kwargs: {extra_kwargs!r}") @@ -738,14 +737,14 @@ def list_aggregated_vulnerability_data(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'), @@ -886,7 +885,7 @@ def list_databases(self, **kwargs): "image_compliance", "severity_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_databases got unknown kwargs: {extra_kwargs!r}") @@ -949,14 +948,14 @@ def list_databases(self, **kwargs): "imageCompliance": kwargs.get("image_compliance", missing), "severityType": self.base_client.generate_collection_format_param(kwargs.get("severity_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'), @@ -1038,7 +1037,7 @@ def list_notifications(self, compartment_id, **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"list_notifications got unknown kwargs: {extra_kwargs!r}") @@ -1047,14 +1046,14 @@ def list_notifications(self, compartment_id, **kwargs): "compartmentId": compartment_id, "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'), @@ -1190,7 +1189,7 @@ def list_vulnerabilities(self, **kwargs): "severity_type", "search_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_vulnerabilities got unknown kwargs: {extra_kwargs!r}") @@ -1237,7 +1236,7 @@ def list_vulnerabilities(self, **kwargs): "severityType": self.base_client.generate_collection_format_param(kwargs.get("severity_type", missing), 'multi'), "searchBy": kwargs.get("search_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1245,7 +1244,7 @@ def list_vulnerabilities(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'), @@ -1376,7 +1375,7 @@ def list_vulnerability_resources(self, compartment_id, **kwargs): "patch_recommendation", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_resources got unknown kwargs: {extra_kwargs!r}") @@ -1431,14 +1430,14 @@ def list_vulnerability_resources(self, compartment_id, **kwargs): "severityType": self.base_client.generate_collection_format_param(kwargs.get("severity_type", missing), 'multi'), "patchRecommendation": self.base_client.generate_collection_format_param(kwargs.get("patch_recommendation", 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'), @@ -1566,7 +1565,7 @@ def list_vulnerability_scans(self, **kwargs): "vulnerability_scan_status", "vulnerability_scan_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_vulnerability_scans got unknown kwargs: {extra_kwargs!r}") @@ -1613,14 +1612,14 @@ def list_vulnerability_scans(self, **kwargs): "vulnerabilityScanStatus": self.base_client.generate_collection_format_param(kwargs.get("vulnerability_scan_status", missing), 'multi'), "vulnerabilityScanType": kwargs.get("vulnerability_scan_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'), @@ -1718,7 +1717,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}") @@ -1727,10 +1726,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: @@ -1753,14 +1752,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'), @@ -1860,7 +1859,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}") @@ -1869,10 +1868,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: @@ -1895,14 +1894,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'), @@ -2017,7 +2016,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}") @@ -2053,14 +2052,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/dbmulticloud/db_multicloud_aws_provider_client.py b/src/oci/dbmulticloud/db_multicloud_aws_provider_client.py index fb088caba4..887406cc9d 100644 --- a/src/oci/dbmulticloud/db_multicloud_aws_provider_client.py +++ b/src/oci/dbmulticloud/db_multicloud_aws_provider_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 change_oracle_db_aws_identity_connector_compartment(self, oracle_db_aws_iden "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_oracle_db_aws_identity_connector_compartment got unknown kwargs: {extra_kwargs!r}") @@ -224,10 +223,10 @@ def change_oracle_db_aws_identity_connector_compartment(self, oracle_db_aws_iden "oracleDbAwsIdentityConnectorId": oracle_db_aws_identity_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 = { @@ -237,7 +236,7 @@ def change_oracle_db_aws_identity_connector_compartment(self, oracle_db_aws_iden "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -337,7 +336,7 @@ def change_oracle_db_aws_key_compartment(self, oracle_db_aws_key_id, change_orac "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_oracle_db_aws_key_compartment got unknown kwargs: {extra_kwargs!r}") @@ -346,10 +345,10 @@ def change_oracle_db_aws_key_compartment(self, oracle_db_aws_key_id, change_orac "oracleDbAwsKeyId": oracle_db_aws_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 = { @@ -359,7 +358,7 @@ def change_oracle_db_aws_key_compartment(self, oracle_db_aws_key_id, change_orac "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 create_oracle_db_aws_identity_connector(self, create_oracle_db_aws_identity_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_oracle_db_aws_identity_connector got unknown kwargs: {extra_kwargs!r}") @@ -457,7 +456,7 @@ def create_oracle_db_aws_identity_connector(self, create_oracle_db_aws_identity_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -552,7 +551,7 @@ def create_oracle_db_aws_key(self, create_oracle_db_aws_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"create_oracle_db_aws_key got unknown kwargs: {extra_kwargs!r}") @@ -564,7 +563,7 @@ def create_oracle_db_aws_key(self, create_oracle_db_aws_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'), @@ -653,7 +652,7 @@ def delete_oracle_db_aws_identity_connector(self, oracle_db_aws_identity_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"delete_oracle_db_aws_identity_connector got unknown kwargs: {extra_kwargs!r}") @@ -662,10 +661,10 @@ def delete_oracle_db_aws_identity_connector(self, oracle_db_aws_identity_connect "oracleDbAwsIdentityConnectorId": oracle_db_aws_identity_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 = { @@ -674,7 +673,7 @@ def delete_oracle_db_aws_identity_connector(self, oracle_db_aws_identity_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'), @@ -760,7 +759,7 @@ def delete_oracle_db_aws_key(self, oracle_db_aws_key_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_oracle_db_aws_key got unknown kwargs: {extra_kwargs!r}") @@ -769,10 +768,10 @@ def delete_oracle_db_aws_key(self, oracle_db_aws_key_id, **kwargs): "oracleDbAwsKeyId": oracle_db_aws_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 = { @@ -781,7 +780,7 @@ def delete_oracle_db_aws_key(self, oracle_db_aws_key_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 get_oracle_db_aws_identity_connector(self, oracle_db_aws_identity_connector_ "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_oracle_db_aws_identity_connector got unknown kwargs: {extra_kwargs!r}") @@ -870,10 +869,10 @@ def get_oracle_db_aws_identity_connector(self, oracle_db_aws_identity_connector_ "oracleDbAwsIdentityConnectorId": oracle_db_aws_identity_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 = { @@ -881,7 +880,7 @@ def get_oracle_db_aws_identity_connector(self, oracle_db_aws_identity_connector_ "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -977,7 +976,7 @@ def get_oracle_db_aws_key(self, oracle_db_aws_key_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"get_oracle_db_aws_key got unknown kwargs: {extra_kwargs!r}") @@ -986,10 +985,10 @@ def get_oracle_db_aws_key(self, oracle_db_aws_key_id, **kwargs): "oracleDbAwsKeyId": oracle_db_aws_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_order' in kwargs: @@ -1004,14 +1003,14 @@ def get_oracle_db_aws_key(self, oracle_db_aws_key_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'), @@ -1129,7 +1128,7 @@ def list_oracle_db_aws_identity_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_oracle_db_aws_identity_connectors got unknown kwargs: {extra_kwargs!r}") @@ -1165,14 +1164,14 @@ def list_oracle_db_aws_identity_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'), @@ -1292,7 +1291,7 @@ def list_oracle_db_aws_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_oracle_db_aws_keys got unknown kwargs: {extra_kwargs!r}") @@ -1329,14 +1328,14 @@ def list_oracle_db_aws_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'), @@ -1432,7 +1431,7 @@ def refresh_oracle_db_aws_identity_connector(self, oracle_db_aws_identity_connec "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_oracle_db_aws_identity_connector got unknown kwargs: {extra_kwargs!r}") @@ -1441,10 +1440,10 @@ def refresh_oracle_db_aws_identity_connector(self, oracle_db_aws_identity_connec "oracleDbAwsIdentityConnectorId": oracle_db_aws_identity_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 = { @@ -1454,7 +1453,7 @@ def refresh_oracle_db_aws_identity_connector(self, oracle_db_aws_identity_connec "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1552,7 +1551,7 @@ def refresh_oracle_db_aws_key(self, oracle_db_aws_key_id, refresh_oracle_db_aws_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_oracle_db_aws_key got unknown kwargs: {extra_kwargs!r}") @@ -1561,10 +1560,10 @@ def refresh_oracle_db_aws_key(self, oracle_db_aws_key_id, refresh_oracle_db_aws_ "oracleDbAwsKeyId": oracle_db_aws_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 = { @@ -1574,7 +1573,7 @@ def refresh_oracle_db_aws_key(self, oracle_db_aws_key_id, refresh_oracle_db_aws_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 update_oracle_db_aws_identity_connector(self, oracle_db_aws_identity_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"update_oracle_db_aws_identity_connector got unknown kwargs: {extra_kwargs!r}") @@ -1677,10 +1676,10 @@ def update_oracle_db_aws_identity_connector(self, oracle_db_aws_identity_connect "oracleDbAwsIdentityConnectorId": oracle_db_aws_identity_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 = { @@ -1689,7 +1688,7 @@ def update_oracle_db_aws_identity_connector(self, oracle_db_aws_identity_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'), @@ -1782,7 +1781,7 @@ def update_oracle_db_aws_key(self, oracle_db_aws_key_id, update_oracle_db_aws_ke "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_oracle_db_aws_key got unknown kwargs: {extra_kwargs!r}") @@ -1791,10 +1790,10 @@ def update_oracle_db_aws_key(self, oracle_db_aws_key_id, update_oracle_db_aws_ke "oracleDbAwsKeyId": oracle_db_aws_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 = { @@ -1803,7 +1802,7 @@ def update_oracle_db_aws_key(self, oracle_db_aws_key_id, update_oracle_db_aws_ke "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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/dbmulticloud/db_multicloud_gcp_provider_client.py b/src/oci/dbmulticloud/db_multicloud_gcp_provider_client.py index 375a86b151..9a2e9c436a 100644 --- a/src/oci/dbmulticloud/db_multicloud_gcp_provider_client.py +++ b/src/oci/dbmulticloud/db_multicloud_gcp_provider_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 change_oracle_db_gcp_identity_connector_compartment(self, oracle_db_gcp_iden "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_oracle_db_gcp_identity_connector_compartment got unknown kwargs: {extra_kwargs!r}") @@ -224,10 +223,10 @@ def change_oracle_db_gcp_identity_connector_compartment(self, oracle_db_gcp_iden "oracleDbGcpIdentityConnectorId": oracle_db_gcp_identity_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 = { @@ -237,7 +236,7 @@ def change_oracle_db_gcp_identity_connector_compartment(self, oracle_db_gcp_iden "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -337,7 +336,7 @@ def change_oracle_db_gcp_key_ring_compartment(self, oracle_db_gcp_key_ring_id, 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_oracle_db_gcp_key_ring_compartment got unknown kwargs: {extra_kwargs!r}") @@ -346,10 +345,10 @@ def change_oracle_db_gcp_key_ring_compartment(self, oracle_db_gcp_key_ring_id, c "oracleDbGcpKeyRingId": oracle_db_gcp_key_ring_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -359,7 +358,7 @@ def change_oracle_db_gcp_key_ring_compartment(self, oracle_db_gcp_key_ring_id, 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'), @@ -446,7 +445,7 @@ def create_oracle_db_gcp_identity_connector(self, create_oracle_db_gcp_identity_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_oracle_db_gcp_identity_connector got unknown kwargs: {extra_kwargs!r}") @@ -457,7 +456,7 @@ def create_oracle_db_gcp_identity_connector(self, create_oracle_db_gcp_identity_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -552,7 +551,7 @@ def create_oracle_db_gcp_key_ring(self, create_oracle_db_gcp_key_ring_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"create_oracle_db_gcp_key_ring got unknown kwargs: {extra_kwargs!r}") @@ -564,7 +563,7 @@ def create_oracle_db_gcp_key_ring(self, create_oracle_db_gcp_key_ring_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'), @@ -653,7 +652,7 @@ def delete_oracle_db_gcp_identity_connector(self, oracle_db_gcp_identity_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"delete_oracle_db_gcp_identity_connector got unknown kwargs: {extra_kwargs!r}") @@ -662,10 +661,10 @@ def delete_oracle_db_gcp_identity_connector(self, oracle_db_gcp_identity_connect "oracleDbGcpIdentityConnectorId": oracle_db_gcp_identity_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 = { @@ -674,7 +673,7 @@ def delete_oracle_db_gcp_identity_connector(self, oracle_db_gcp_identity_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'), @@ -760,7 +759,7 @@ def delete_oracle_db_gcp_key_ring(self, oracle_db_gcp_key_ring_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_oracle_db_gcp_key_ring got unknown kwargs: {extra_kwargs!r}") @@ -769,10 +768,10 @@ def delete_oracle_db_gcp_key_ring(self, oracle_db_gcp_key_ring_id, **kwargs): "oracleDbGcpKeyRingId": oracle_db_gcp_key_ring_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -781,7 +780,7 @@ def delete_oracle_db_gcp_key_ring(self, oracle_db_gcp_key_ring_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 get_oracle_db_gcp_identity_connector(self, oracle_db_gcp_identity_connector_ "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_oracle_db_gcp_identity_connector got unknown kwargs: {extra_kwargs!r}") @@ -870,10 +869,10 @@ def get_oracle_db_gcp_identity_connector(self, oracle_db_gcp_identity_connector_ "oracleDbGcpIdentityConnectorId": oracle_db_gcp_identity_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 = { @@ -881,7 +880,7 @@ def get_oracle_db_gcp_identity_connector(self, oracle_db_gcp_identity_connector_ "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 get_oracle_db_gcp_key(self, oracle_db_gcp_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_oracle_db_gcp_key got unknown kwargs: {extra_kwargs!r}") @@ -972,10 +971,10 @@ def get_oracle_db_gcp_key(self, oracle_db_gcp_key_id, **kwargs): "oracleDbGcpKeyId": oracle_db_gcp_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 = { @@ -983,7 +982,7 @@ def get_oracle_db_gcp_key(self, oracle_db_gcp_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'), @@ -1079,7 +1078,7 @@ def get_oracle_db_gcp_key_ring(self, oracle_db_gcp_key_ring_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"get_oracle_db_gcp_key_ring got unknown kwargs: {extra_kwargs!r}") @@ -1088,10 +1087,10 @@ def get_oracle_db_gcp_key_ring(self, oracle_db_gcp_key_ring_id, **kwargs): "oracleDbGcpKeyRingId": oracle_db_gcp_key_ring_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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: @@ -1106,14 +1105,14 @@ def get_oracle_db_gcp_key_ring(self, oracle_db_gcp_key_ring_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'), @@ -1231,7 +1230,7 @@ def list_oracle_db_gcp_identity_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_oracle_db_gcp_identity_connectors got unknown kwargs: {extra_kwargs!r}") @@ -1267,14 +1266,14 @@ def list_oracle_db_gcp_identity_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'), @@ -1395,7 +1394,7 @@ def list_oracle_db_gcp_key_rings(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_oracle_db_gcp_key_rings got unknown kwargs: {extra_kwargs!r}") @@ -1432,14 +1431,14 @@ def list_oracle_db_gcp_key_rings(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'), @@ -1557,7 +1556,7 @@ def list_oracle_db_gcp_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_oracle_db_gcp_keys got unknown kwargs: {extra_kwargs!r}") @@ -1594,14 +1593,14 @@ def list_oracle_db_gcp_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'), @@ -1697,7 +1696,7 @@ def refresh_oracle_db_gcp_identity_connector(self, oracle_db_gcp_identity_connec "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_oracle_db_gcp_identity_connector got unknown kwargs: {extra_kwargs!r}") @@ -1706,10 +1705,10 @@ def refresh_oracle_db_gcp_identity_connector(self, oracle_db_gcp_identity_connec "oracleDbGcpIdentityConnectorId": oracle_db_gcp_identity_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 = { @@ -1719,7 +1718,7 @@ def refresh_oracle_db_gcp_identity_connector(self, oracle_db_gcp_identity_connec "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 refresh_oracle_db_gcp_key_ring(self, oracle_db_gcp_key_ring_id, refresh_orac "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_oracle_db_gcp_key_ring got unknown kwargs: {extra_kwargs!r}") @@ -1826,10 +1825,10 @@ def refresh_oracle_db_gcp_key_ring(self, oracle_db_gcp_key_ring_id, refresh_orac "oracleDbGcpKeyRingId": oracle_db_gcp_key_ring_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 refresh_oracle_db_gcp_key_ring(self, oracle_db_gcp_key_ring_id, refresh_orac "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 update_oracle_db_gcp_identity_connector(self, oracle_db_gcp_identity_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"update_oracle_db_gcp_identity_connector got unknown kwargs: {extra_kwargs!r}") @@ -1942,10 +1941,10 @@ def update_oracle_db_gcp_identity_connector(self, oracle_db_gcp_identity_connect "oracleDbGcpIdentityConnectorId": oracle_db_gcp_identity_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 = { @@ -1954,7 +1953,7 @@ def update_oracle_db_gcp_identity_connector(self, oracle_db_gcp_identity_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'), @@ -2047,7 +2046,7 @@ def update_oracle_db_gcp_key_ring(self, oracle_db_gcp_key_ring_id, update_oracle "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_oracle_db_gcp_key_ring got unknown kwargs: {extra_kwargs!r}") @@ -2056,10 +2055,10 @@ def update_oracle_db_gcp_key_ring(self, oracle_db_gcp_key_ring_id, update_oracle "oracleDbGcpKeyRingId": oracle_db_gcp_key_ring_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 update_oracle_db_gcp_key_ring(self, oracle_db_gcp_key_ring_id, update_oracle "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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/dbmulticloud/multi_cloud_resource_discovery_client.py b/src/oci/dbmulticloud/multi_cloud_resource_discovery_client.py index f3c5d0e2bd..fcb6ce011d 100644 --- a/src/oci/dbmulticloud/multi_cloud_resource_discovery_client.py +++ b/src/oci/dbmulticloud/multi_cloud_resource_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 @@ -215,7 +214,7 @@ def change_multi_cloud_resource_discovery_compartment(self, multi_cloud_resource "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_multi_cloud_resource_discovery_compartment got unknown kwargs: {extra_kwargs!r}") @@ -224,10 +223,10 @@ def change_multi_cloud_resource_discovery_compartment(self, multi_cloud_resource "multiCloudResourceDiscoveryId": multi_cloud_resource_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 = { @@ -237,7 +236,7 @@ def change_multi_cloud_resource_discovery_compartment(self, multi_cloud_resource "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 create_multi_cloud_resource_discovery(self, create_multi_cloud_resource_disc "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_multi_cloud_resource_discovery got unknown kwargs: {extra_kwargs!r}") @@ -344,7 +343,7 @@ def create_multi_cloud_resource_discovery(self, create_multi_cloud_resource_disc "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -433,7 +432,7 @@ def delete_multi_cloud_resource_discovery(self, multi_cloud_resource_discovery_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_multi_cloud_resource_discovery got unknown kwargs: {extra_kwargs!r}") @@ -442,10 +441,10 @@ def delete_multi_cloud_resource_discovery(self, multi_cloud_resource_discovery_i "multiCloudResourceDiscoveryId": multi_cloud_resource_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 = { @@ -454,7 +453,7 @@ def delete_multi_cloud_resource_discovery(self, multi_cloud_resource_discovery_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'), @@ -548,7 +547,7 @@ def get_multi_cloud_resource_discovery(self, multi_cloud_resource_discovery_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"get_multi_cloud_resource_discovery got unknown kwargs: {extra_kwargs!r}") @@ -557,10 +556,10 @@ def get_multi_cloud_resource_discovery(self, multi_cloud_resource_discovery_id, "multiCloudResourceDiscoveryId": multi_cloud_resource_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 'sort_order' in kwargs: @@ -575,14 +574,14 @@ def get_multi_cloud_resource_discovery(self, multi_cloud_resource_discovery_id, "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'), @@ -714,7 +713,7 @@ def list_multi_cloud_resource_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_multi_cloud_resource_discoveries got unknown kwargs: {extra_kwargs!r}") @@ -760,14 +759,14 @@ def list_multi_cloud_resource_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'), @@ -860,7 +859,7 @@ def update_multi_cloud_resource_discovery(self, multi_cloud_resource_discovery_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_multi_cloud_resource_discovery got unknown kwargs: {extra_kwargs!r}") @@ -869,10 +868,10 @@ def update_multi_cloud_resource_discovery(self, multi_cloud_resource_discovery_i "multiCloudResourceDiscoveryId": multi_cloud_resource_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 = { @@ -881,7 +880,7 @@ def update_multi_cloud_resource_discovery(self, multi_cloud_resource_discovery_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/dbmulticloud/oracle_db_azure_blob_container_client.py b/src/oci/dbmulticloud/oracle_db_azure_blob_container_client.py index 7cb226834e..e08208e3b2 100644 --- a/src/oci/dbmulticloud/oracle_db_azure_blob_container_client.py +++ b/src/oci/dbmulticloud/oracle_db_azure_blob_container_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 change_oracle_db_azure_blob_container_compartment(self, oracle_db_azure_blob "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_oracle_db_azure_blob_container_compartment got unknown kwargs: {extra_kwargs!r}") @@ -224,10 +223,10 @@ def change_oracle_db_azure_blob_container_compartment(self, oracle_db_azure_blob "oracleDbAzureBlobContainerId": oracle_db_azure_blob_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 = { @@ -237,7 +236,7 @@ def change_oracle_db_azure_blob_container_compartment(self, oracle_db_azure_blob "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 create_oracle_db_azure_blob_container(self, create_oracle_db_azure_blob_cont "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_oracle_db_azure_blob_container got unknown kwargs: {extra_kwargs!r}") @@ -344,7 +343,7 @@ def create_oracle_db_azure_blob_container(self, create_oracle_db_azure_blob_cont "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -433,7 +432,7 @@ def delete_oracle_db_azure_blob_container(self, oracle_db_azure_blob_container_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_oracle_db_azure_blob_container got unknown kwargs: {extra_kwargs!r}") @@ -442,10 +441,10 @@ def delete_oracle_db_azure_blob_container(self, oracle_db_azure_blob_container_i "oracleDbAzureBlobContainerId": oracle_db_azure_blob_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 = { @@ -454,7 +453,7 @@ def delete_oracle_db_azure_blob_container(self, oracle_db_azure_blob_container_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'), @@ -548,7 +547,7 @@ def get_oracle_db_azure_blob_container(self, oracle_db_azure_blob_container_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"get_oracle_db_azure_blob_container got unknown kwargs: {extra_kwargs!r}") @@ -557,10 +556,10 @@ def get_oracle_db_azure_blob_container(self, oracle_db_azure_blob_container_id, "oracleDbAzureBlobContainerId": oracle_db_azure_blob_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') if 'sort_order' in kwargs: @@ -575,14 +574,14 @@ def get_oracle_db_azure_blob_container(self, oracle_db_azure_blob_container_id, "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'), @@ -706,7 +705,7 @@ def list_oracle_db_azure_blob_containers(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_oracle_db_azure_blob_containers got unknown kwargs: {extra_kwargs!r}") @@ -744,14 +743,14 @@ def list_oracle_db_azure_blob_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'), @@ -844,7 +843,7 @@ def update_oracle_db_azure_blob_container(self, oracle_db_azure_blob_container_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_oracle_db_azure_blob_container got unknown kwargs: {extra_kwargs!r}") @@ -853,10 +852,10 @@ def update_oracle_db_azure_blob_container(self, oracle_db_azure_blob_container_i "oracleDbAzureBlobContainerId": oracle_db_azure_blob_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 = { @@ -865,7 +864,7 @@ def update_oracle_db_azure_blob_container(self, oracle_db_azure_blob_container_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/dbmulticloud/oracle_db_azure_blob_mount_client.py b/src/oci/dbmulticloud/oracle_db_azure_blob_mount_client.py index 427788fdfb..463f94cbae 100644 --- a/src/oci/dbmulticloud/oracle_db_azure_blob_mount_client.py +++ b/src/oci/dbmulticloud/oracle_db_azure_blob_mount_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 change_oracle_db_azure_blob_mount_compartment(self, oracle_db_azure_blob_mou "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_oracle_db_azure_blob_mount_compartment got unknown kwargs: {extra_kwargs!r}") @@ -224,10 +223,10 @@ def change_oracle_db_azure_blob_mount_compartment(self, oracle_db_azure_blob_mou "oracleDbAzureBlobMountId": oracle_db_azure_blob_mount_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -237,7 +236,7 @@ def change_oracle_db_azure_blob_mount_compartment(self, oracle_db_azure_blob_mou "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 create_oracle_db_azure_blob_mount(self, create_oracle_db_azure_blob_mount_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"create_oracle_db_azure_blob_mount got unknown kwargs: {extra_kwargs!r}") @@ -344,7 +343,7 @@ def create_oracle_db_azure_blob_mount(self, create_oracle_db_azure_blob_mount_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'), @@ -433,7 +432,7 @@ def delete_oracle_db_azure_blob_mount(self, oracle_db_azure_blob_mount_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_oracle_db_azure_blob_mount got unknown kwargs: {extra_kwargs!r}") @@ -442,10 +441,10 @@ def delete_oracle_db_azure_blob_mount(self, oracle_db_azure_blob_mount_id, **kwa "oracleDbAzureBlobMountId": oracle_db_azure_blob_mount_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -454,7 +453,7 @@ def delete_oracle_db_azure_blob_mount(self, oracle_db_azure_blob_mount_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'), @@ -548,7 +547,7 @@ def get_oracle_db_azure_blob_mount(self, oracle_db_azure_blob_mount_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"get_oracle_db_azure_blob_mount got unknown kwargs: {extra_kwargs!r}") @@ -557,10 +556,10 @@ def get_oracle_db_azure_blob_mount(self, oracle_db_azure_blob_mount_id, **kwargs "oracleDbAzureBlobMountId": oracle_db_azure_blob_mount_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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: @@ -575,14 +574,14 @@ def get_oracle_db_azure_blob_mount(self, oracle_db_azure_blob_mount_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'), @@ -708,7 +707,7 @@ def list_oracle_db_azure_blob_mounts(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_oracle_db_azure_blob_mounts got unknown kwargs: {extra_kwargs!r}") @@ -746,14 +745,14 @@ def list_oracle_db_azure_blob_mounts(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'), @@ -846,7 +845,7 @@ def update_oracle_db_azure_blob_mount(self, oracle_db_azure_blob_mount_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_oracle_db_azure_blob_mount got unknown kwargs: {extra_kwargs!r}") @@ -855,10 +854,10 @@ def update_oracle_db_azure_blob_mount(self, oracle_db_azure_blob_mount_id, updat "oracleDbAzureBlobMountId": oracle_db_azure_blob_mount_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -867,7 +866,7 @@ def update_oracle_db_azure_blob_mount(self, oracle_db_azure_blob_mount_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'), diff --git a/src/oci/dbmulticloud/oracle_db_azure_connector_client.py b/src/oci/dbmulticloud/oracle_db_azure_connector_client.py index 5bd8909017..086e6e5fa0 100644 --- a/src/oci/dbmulticloud/oracle_db_azure_connector_client.py +++ b/src/oci/dbmulticloud/oracle_db_azure_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 @@ -215,7 +214,7 @@ def change_oracle_db_azure_connector_compartment(self, oracle_db_azure_connector "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_oracle_db_azure_connector_compartment got unknown kwargs: {extra_kwargs!r}") @@ -224,10 +223,10 @@ def change_oracle_db_azure_connector_compartment(self, oracle_db_azure_connector "oracleDbAzureConnectorId": oracle_db_azure_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 = { @@ -237,7 +236,7 @@ def change_oracle_db_azure_connector_compartment(self, oracle_db_azure_connector "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -325,7 +324,7 @@ def create_oracle_db_azure_connector(self, create_oracle_db_azure_connector_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_oracle_db_azure_connector got unknown kwargs: {extra_kwargs!r}") @@ -336,7 +335,7 @@ def create_oracle_db_azure_connector(self, create_oracle_db_azure_connector_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'), @@ -425,7 +424,7 @@ def delete_oracle_db_azure_connector(self, oracle_db_azure_connector_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_oracle_db_azure_connector got unknown kwargs: {extra_kwargs!r}") @@ -434,10 +433,10 @@ def delete_oracle_db_azure_connector(self, oracle_db_azure_connector_id, **kwarg "oracleDbAzureConnectorId": oracle_db_azure_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 = { @@ -446,7 +445,7 @@ def delete_oracle_db_azure_connector(self, oracle_db_azure_connector_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'), @@ -540,7 +539,7 @@ def get_oracle_db_azure_connector(self, oracle_db_azure_connector_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"get_oracle_db_azure_connector got unknown kwargs: {extra_kwargs!r}") @@ -549,10 +548,10 @@ def get_oracle_db_azure_connector(self, oracle_db_azure_connector_id, **kwargs): "oracleDbAzureConnectorId": oracle_db_azure_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') if 'sort_order' in kwargs: @@ -567,14 +566,14 @@ def get_oracle_db_azure_connector(self, oracle_db_azure_connector_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'), @@ -696,7 +695,7 @@ def list_oracle_db_azure_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_oracle_db_azure_connectors got unknown kwargs: {extra_kwargs!r}") @@ -733,14 +732,14 @@ def list_oracle_db_azure_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'), @@ -831,7 +830,7 @@ def patch_oracle_db_azure_connector(self, oracle_db_azure_connector_id, patch_or "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_oracle_db_azure_connector got unknown kwargs: {extra_kwargs!r}") @@ -840,10 +839,10 @@ def patch_oracle_db_azure_connector(self, oracle_db_azure_connector_id, patch_or "oracleDbAzureConnectorId": oracle_db_azure_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 = { @@ -852,7 +851,7 @@ def patch_oracle_db_azure_connector(self, oracle_db_azure_connector_id, patch_or "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 refresh_oracle_db_azure_connector(self, oracle_db_azure_connector_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"refresh_oracle_db_azure_connector got unknown kwargs: {extra_kwargs!r}") @@ -957,10 +956,10 @@ def refresh_oracle_db_azure_connector(self, oracle_db_azure_connector_id, **kwar "oracleDbAzureConnectorId": oracle_db_azure_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 = { @@ -970,7 +969,7 @@ def refresh_oracle_db_azure_connector(self, oracle_db_azure_connector_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'), @@ -1062,7 +1061,7 @@ def update_oracle_db_azure_connector(self, oracle_db_azure_connector_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_oracle_db_azure_connector got unknown kwargs: {extra_kwargs!r}") @@ -1071,10 +1070,10 @@ def update_oracle_db_azure_connector(self, oracle_db_azure_connector_id, update_ "oracleDbAzureConnectorId": oracle_db_azure_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 = { @@ -1083,7 +1082,7 @@ def update_oracle_db_azure_connector(self, oracle_db_azure_connector_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/dbmulticloud/oracle_db_azure_key_client.py b/src/oci/dbmulticloud/oracle_db_azure_key_client.py index 74033603ca..03e8e79324 100644 --- a/src/oci/dbmulticloud/oracle_db_azure_key_client.py +++ b/src/oci/dbmulticloud/oracle_db_azure_key_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 get_oracle_db_azure_key(self, oracle_db_azure_key_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"get_oracle_db_azure_key got unknown kwargs: {extra_kwargs!r}") @@ -221,10 +220,10 @@ def get_oracle_db_azure_key(self, oracle_db_azure_key_id, **kwargs): "oracleDbAzureKeyId": oracle_db_azure_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_order' in kwargs: @@ -239,14 +238,14 @@ def get_oracle_db_azure_key(self, oracle_db_azure_key_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'), @@ -370,7 +369,7 @@ def list_oracle_db_azure_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_oracle_db_azure_keys got unknown kwargs: {extra_kwargs!r}") @@ -407,14 +406,14 @@ def list_oracle_db_azure_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'), diff --git a/src/oci/dbmulticloud/oracle_db_azure_vault_association_client.py b/src/oci/dbmulticloud/oracle_db_azure_vault_association_client.py index 1fb3affa2f..6239f865d8 100644 --- a/src/oci/dbmulticloud/oracle_db_azure_vault_association_client.py +++ b/src/oci/dbmulticloud/oracle_db_azure_vault_association_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 cascading_delete_oracle_db_azure_vault_association(self, oracle_db_azure_vau "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_oracle_db_azure_vault_association got unknown kwargs: {extra_kwargs!r}") @@ -221,10 +220,10 @@ def cascading_delete_oracle_db_azure_vault_association(self, oracle_db_azure_vau "oracleDbAzureVaultAssociationId": oracle_db_azure_vault_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 = { @@ -234,7 +233,7 @@ def cascading_delete_oracle_db_azure_vault_association(self, oracle_db_azure_vau "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 change_oracle_db_azure_vault_association_compartment(self, oracle_db_azure_v "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_oracle_db_azure_vault_association_compartment got unknown kwargs: {extra_kwargs!r}") @@ -341,10 +340,10 @@ def change_oracle_db_azure_vault_association_compartment(self, oracle_db_azure_v "oracleDbAzureVaultAssociationId": oracle_db_azure_vault_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 = { @@ -354,7 +353,7 @@ def change_oracle_db_azure_vault_association_compartment(self, oracle_db_azure_v "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -449,7 +448,7 @@ def create_oracle_db_azure_vault_association(self, create_oracle_db_azure_vault_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_oracle_db_azure_vault_association got unknown kwargs: {extra_kwargs!r}") @@ -461,7 +460,7 @@ def create_oracle_db_azure_vault_association(self, create_oracle_db_azure_vault_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -550,7 +549,7 @@ def delete_oracle_db_azure_vault_association(self, oracle_db_azure_vault_associa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_oracle_db_azure_vault_association got unknown kwargs: {extra_kwargs!r}") @@ -559,10 +558,10 @@ def delete_oracle_db_azure_vault_association(self, oracle_db_azure_vault_associa "oracleDbAzureVaultAssociationId": oracle_db_azure_vault_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 = { @@ -571,7 +570,7 @@ def delete_oracle_db_azure_vault_association(self, oracle_db_azure_vault_associa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_oracle_db_azure_vault_association(self, oracle_db_azure_vault_associatio "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"get_oracle_db_azure_vault_association got unknown kwargs: {extra_kwargs!r}") @@ -674,10 +673,10 @@ def get_oracle_db_azure_vault_association(self, oracle_db_azure_vault_associatio "oracleDbAzureVaultAssociationId": oracle_db_azure_vault_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') if 'sort_order' in kwargs: @@ -692,14 +691,14 @@ def get_oracle_db_azure_vault_association(self, oracle_db_azure_vault_associatio "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'), @@ -825,7 +824,7 @@ def list_oracle_db_azure_vault_associations(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_oracle_db_azure_vault_associations got unknown kwargs: {extra_kwargs!r}") @@ -863,14 +862,14 @@ def list_oracle_db_azure_vault_associations(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'), @@ -963,7 +962,7 @@ def update_oracle_db_azure_vault_association(self, oracle_db_azure_vault_associa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_oracle_db_azure_vault_association got unknown kwargs: {extra_kwargs!r}") @@ -972,10 +971,10 @@ def update_oracle_db_azure_vault_association(self, oracle_db_azure_vault_associa "oracleDbAzureVaultAssociationId": oracle_db_azure_vault_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 = { @@ -984,7 +983,7 @@ def update_oracle_db_azure_vault_association(self, oracle_db_azure_vault_associa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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/dbmulticloud/oracle_db_azure_vault_client.py b/src/oci/dbmulticloud/oracle_db_azure_vault_client.py index 945f6554d2..f128b8486b 100644 --- a/src/oci/dbmulticloud/oracle_db_azure_vault_client.py +++ b/src/oci/dbmulticloud/oracle_db_azure_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 @@ -215,7 +214,7 @@ def change_oracle_db_azure_vault_compartment(self, oracle_db_azure_vault_id, 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_oracle_db_azure_vault_compartment got unknown kwargs: {extra_kwargs!r}") @@ -224,10 +223,10 @@ def change_oracle_db_azure_vault_compartment(self, oracle_db_azure_vault_id, cha "oracleDbAzureVaultId": oracle_db_azure_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 = { @@ -237,7 +236,7 @@ def change_oracle_db_azure_vault_compartment(self, oracle_db_azure_vault_id, 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'), @@ -332,7 +331,7 @@ def create_oracle_db_azure_vault(self, create_oracle_db_azure_vault_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"create_oracle_db_azure_vault got unknown kwargs: {extra_kwargs!r}") @@ -344,7 +343,7 @@ def create_oracle_db_azure_vault(self, create_oracle_db_azure_vault_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'), @@ -433,7 +432,7 @@ def delete_oracle_db_azure_vault(self, oracle_db_azure_vault_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_oracle_db_azure_vault got unknown kwargs: {extra_kwargs!r}") @@ -442,10 +441,10 @@ def delete_oracle_db_azure_vault(self, oracle_db_azure_vault_id, **kwargs): "oracleDbAzureVaultId": oracle_db_azure_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 = { @@ -454,7 +453,7 @@ def delete_oracle_db_azure_vault(self, oracle_db_azure_vault_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 get_oracle_db_azure_vault(self, oracle_db_azure_vault_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"get_oracle_db_azure_vault got unknown kwargs: {extra_kwargs!r}") @@ -557,10 +556,10 @@ def get_oracle_db_azure_vault(self, oracle_db_azure_vault_id, **kwargs): "oracleDbAzureVaultId": oracle_db_azure_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_order' in kwargs: @@ -575,14 +574,14 @@ def get_oracle_db_azure_vault(self, oracle_db_azure_vault_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'), @@ -708,7 +707,7 @@ def list_oracle_db_azure_vaults(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_oracle_db_azure_vaults got unknown kwargs: {extra_kwargs!r}") @@ -746,14 +745,14 @@ def list_oracle_db_azure_vaults(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'), @@ -853,7 +852,7 @@ def refresh_oracle_db_azure_vault(self, oracle_db_azure_vault_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_oracle_db_azure_vault got unknown kwargs: {extra_kwargs!r}") @@ -862,10 +861,10 @@ def refresh_oracle_db_azure_vault(self, oracle_db_azure_vault_id, **kwargs): "oracleDbAzureVaultId": oracle_db_azure_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 = { @@ -875,7 +874,7 @@ def refresh_oracle_db_azure_vault(self, oracle_db_azure_vault_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 update_oracle_db_azure_vault(self, oracle_db_azure_vault_id, update_oracle_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_oracle_db_azure_vault got unknown kwargs: {extra_kwargs!r}") @@ -978,10 +977,10 @@ def update_oracle_db_azure_vault(self, oracle_db_azure_vault_id, update_oracle_d "oracleDbAzureVaultId": oracle_db_azure_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 = { @@ -990,7 +989,7 @@ def update_oracle_db_azure_vault(self, oracle_db_azure_vault_id, update_oracle_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/dbmulticloud/work_request_client.py b/src/oci/dbmulticloud/work_request_client.py index 0ab9895cab..b745d82729 100644 --- a/src/oci/dbmulticloud/work_request_client.py +++ b/src/oci/dbmulticloud/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 @@ -202,7 +201,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}") @@ -211,10 +210,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 = { @@ -223,7 +222,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'), @@ -299,7 +298,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}") @@ -308,10 +307,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 = { @@ -319,7 +318,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'), @@ -417,7 +416,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}") @@ -426,10 +425,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: @@ -452,14 +451,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'), @@ -559,7 +558,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}") @@ -568,10 +567,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: @@ -594,14 +593,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'), @@ -717,7 +716,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}") @@ -753,14 +752,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/decorators.py b/src/oci/decorators.py index b5d3574ccd..5df63952d0 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/delegate_access_control/delegate_access_control_client.py b/src/oci/delegate_access_control/delegate_access_control_client.py index 21979bff21..0f3a11e1dc 100644 --- a/src/oci/delegate_access_control/delegate_access_control_client.py +++ b/src/oci/delegate_access_control/delegate_access_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 @@ -183,7 +182,7 @@ def approve_delegated_resource_access_request(self, delegated_resource_access_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"approve_delegated_resource_access_request got unknown kwargs: {extra_kwargs!r}") @@ -192,10 +191,10 @@ def approve_delegated_resource_access_request(self, delegated_resource_access_re "delegatedResourceAccessRequestId": delegated_resource_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 = { @@ -205,7 +204,7 @@ def approve_delegated_resource_access_request(self, delegated_resource_access_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'), @@ -303,7 +302,7 @@ def change_delegation_control_compartment(self, delegation_control_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_delegation_control_compartment got unknown kwargs: {extra_kwargs!r}") @@ -312,10 +311,10 @@ def change_delegation_control_compartment(self, delegation_control_id, change_de "delegationControlId": delegation_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 = { @@ -325,7 +324,7 @@ def change_delegation_control_compartment(self, delegation_control_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'), @@ -423,7 +422,7 @@ def change_delegation_subscription_compartment(self, delegation_subscription_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_delegation_subscription_compartment got unknown kwargs: {extra_kwargs!r}") @@ -432,10 +431,10 @@ def change_delegation_subscription_compartment(self, delegation_subscription_id, "delegationSubscriptionId": delegation_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 = { @@ -445,7 +444,7 @@ def change_delegation_subscription_compartment(self, delegation_subscription_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'), @@ -532,7 +531,7 @@ def create_delegation_control(self, create_delegation_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_delegation_control got unknown kwargs: {extra_kwargs!r}") @@ -543,7 +542,7 @@ def create_delegation_control(self, create_delegation_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'), @@ -630,7 +629,7 @@ def create_delegation_subscription(self, create_delegation_subscription_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_delegation_subscription got unknown kwargs: {extra_kwargs!r}") @@ -641,7 +640,7 @@ def create_delegation_subscription(self, create_delegation_subscription_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'), @@ -736,7 +735,7 @@ def delete_delegation_control(self, delegation_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_delegation_control got unknown kwargs: {extra_kwargs!r}") @@ -745,16 +744,16 @@ def delete_delegation_control(self, delegation_control_id, **kwargs): "delegationControlId": delegation_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", @@ -762,7 +761,7 @@ def delete_delegation_control(self, delegation_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'), @@ -848,7 +847,7 @@ def delete_delegation_subscription(self, delegation_subscription_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_delegation_subscription got unknown kwargs: {extra_kwargs!r}") @@ -857,10 +856,10 @@ def delete_delegation_subscription(self, delegation_subscription_id, **kwargs): "delegationSubscriptionId": delegation_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 = { @@ -869,7 +868,7 @@ def delete_delegation_subscription(self, delegation_subscription_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 get_delegated_resource_access_request(self, delegated_resource_access_reques "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_delegated_resource_access_request got unknown kwargs: {extra_kwargs!r}") @@ -954,10 +953,10 @@ def get_delegated_resource_access_request(self, delegated_resource_access_reques "delegatedResourceAccessRequestId": delegated_resource_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 = { @@ -965,7 +964,7 @@ def get_delegated_resource_access_request(self, delegated_resource_access_reques "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 get_delegated_resource_access_request_audit_log_report(self, delegated_resou "is_process_tree_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"get_delegated_resource_access_request_audit_log_report got unknown kwargs: {extra_kwargs!r}") @@ -1056,23 +1055,23 @@ def get_delegated_resource_access_request_audit_log_report(self, delegated_resou "delegatedResourceAccessRequestId": delegated_resource_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 = { "isProcessTreeEnabled": kwargs.get("is_process_tree_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'), @@ -1152,7 +1151,7 @@ def get_delegation_control(self, delegation_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_delegation_control got unknown kwargs: {extra_kwargs!r}") @@ -1161,10 +1160,10 @@ def get_delegation_control(self, delegation_control_id, **kwargs): "delegationControlId": delegation_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 = { @@ -1172,7 +1171,7 @@ def get_delegation_control(self, delegation_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'), @@ -1250,7 +1249,7 @@ def get_delegation_subscription(self, delegation_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_delegation_subscription got unknown kwargs: {extra_kwargs!r}") @@ -1259,10 +1258,10 @@ def get_delegation_subscription(self, delegation_subscription_id, **kwargs): "delegationSubscriptionId": delegation_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 = { @@ -1270,7 +1269,7 @@ def get_delegation_subscription(self, delegation_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'), @@ -1348,7 +1347,7 @@ def get_service_provider(self, service_provider_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_provider got unknown kwargs: {extra_kwargs!r}") @@ -1357,10 +1356,10 @@ def get_service_provider(self, service_provider_id, **kwargs): "serviceProviderId": service_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 = { @@ -1368,7 +1367,7 @@ def get_service_provider(self, service_provider_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 get_service_provider_action(self, service_provider_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_service_provider_action got unknown kwargs: {extra_kwargs!r}") @@ -1455,10 +1454,10 @@ def get_service_provider_action(self, service_provider_action_id, **kwargs): "serviceProviderActionId": service_provider_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 = { @@ -1466,7 +1465,7 @@ def get_service_provider_action(self, service_provider_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'), @@ -1564,7 +1563,7 @@ def list_delegated_resource_access_request_histories(self, delegated_resource_ac "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_delegated_resource_access_request_histories got unknown kwargs: {extra_kwargs!r}") @@ -1573,10 +1572,10 @@ def list_delegated_resource_access_request_histories(self, delegated_resource_ac "delegatedResourceAccessRequestId": delegated_resource_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') if 'sort_order' in kwargs: @@ -1599,14 +1598,14 @@ def list_delegated_resource_access_request_histories(self, delegated_resource_ac "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1740,7 +1739,7 @@ def list_delegated_resource_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_delegated_resource_access_requests got unknown kwargs: {extra_kwargs!r}") @@ -1786,14 +1785,14 @@ def list_delegated_resource_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'), @@ -1879,7 +1878,7 @@ def list_delegation_control_resources(self, delegation_control_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_delegation_control_resources got unknown kwargs: {extra_kwargs!r}") @@ -1888,24 +1887,24 @@ def list_delegation_control_resources(self, delegation_control_id, **kwargs): "delegationControlId": delegation_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 = { "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'), @@ -2027,7 +2026,7 @@ def list_delegation_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_delegation_controls got unknown kwargs: {extra_kwargs!r}") @@ -2071,14 +2070,14 @@ def list_delegation_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'), @@ -2188,7 +2187,7 @@ def list_delegation_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_delegation_subscriptions got unknown kwargs: {extra_kwargs!r}") @@ -2223,14 +2222,14 @@ def list_delegation_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'), @@ -2352,7 +2351,7 @@ def list_service_provider_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_service_provider_actions got unknown kwargs: {extra_kwargs!r}") @@ -2404,14 +2403,14 @@ def list_service_provider_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'), @@ -2497,7 +2496,7 @@ def list_service_provider_interactions(self, delegated_resource_access_request_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_service_provider_interactions got unknown kwargs: {extra_kwargs!r}") @@ -2506,24 +2505,24 @@ def list_service_provider_interactions(self, delegated_resource_access_request_i "delegatedResourceAccessRequestId": delegated_resource_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'), @@ -2647,7 +2646,7 @@ def list_service_providers(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_providers got unknown kwargs: {extra_kwargs!r}") @@ -2698,14 +2697,14 @@ def list_service_providers(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'), @@ -2802,7 +2801,7 @@ def reject_delegated_resource_access_request(self, delegated_resource_access_req "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_delegated_resource_access_request got unknown kwargs: {extra_kwargs!r}") @@ -2811,10 +2810,10 @@ def reject_delegated_resource_access_request(self, delegated_resource_access_req "delegatedResourceAccessRequestId": delegated_resource_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 = { @@ -2824,7 +2823,7 @@ def reject_delegated_resource_access_request(self, delegated_resource_access_req "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 revoke_delegated_resource_access_request(self, delegated_resource_access_req "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_delegated_resource_access_request got unknown kwargs: {extra_kwargs!r}") @@ -2931,10 +2930,10 @@ def revoke_delegated_resource_access_request(self, delegated_resource_access_req "delegatedResourceAccessRequestId": delegated_resource_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 = { @@ -2944,7 +2943,7 @@ def revoke_delegated_resource_access_request(self, delegated_resource_access_req "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3042,7 +3041,7 @@ def service_provider_interaction_request(self, delegated_resource_access_request "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"service_provider_interaction_request got unknown kwargs: {extra_kwargs!r}") @@ -3051,10 +3050,10 @@ def service_provider_interaction_request(self, delegated_resource_access_request "delegatedResourceAccessRequestId": delegated_resource_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 = { @@ -3064,7 +3063,7 @@ def service_provider_interaction_request(self, delegated_resource_access_request "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3154,7 +3153,7 @@ def update_delegation_control(self, delegation_control_id, update_delegation_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_delegation_control got unknown kwargs: {extra_kwargs!r}") @@ -3163,10 +3162,10 @@ def update_delegation_control(self, delegation_control_id, update_delegation_con "delegationControlId": delegation_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 = { @@ -3175,7 +3174,7 @@ def update_delegation_control(self, delegation_control_id, update_delegation_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'), @@ -3266,7 +3265,7 @@ def update_delegation_subscription(self, delegation_subscription_id, update_dele "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_delegation_subscription got unknown kwargs: {extra_kwargs!r}") @@ -3275,10 +3274,10 @@ def update_delegation_subscription(self, delegation_subscription_id, update_dele "delegationSubscriptionId": delegation_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 = { @@ -3287,7 +3286,7 @@ def update_delegation_subscription(self, delegation_subscription_id, update_dele "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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/delegate_access_control/work_request_client.py b/src/oci/delegate_access_control/work_request_client.py index 003a12b7cd..8b31ca158a 100644 --- a/src/oci/delegate_access_control/work_request_client.py +++ b/src/oci/delegate_access_control/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 @@ -164,7 +163,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}") @@ -173,10 +172,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 = { @@ -184,7 +183,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'), @@ -282,7 +281,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}") @@ -291,10 +290,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: @@ -317,14 +316,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'), @@ -424,7 +423,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}") @@ -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_by' in kwargs: @@ -459,14 +458,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'), @@ -582,7 +581,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}") @@ -618,14 +617,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/demand_signal/occ_demand_signal_client.py b/src/oci/demand_signal/occ_demand_signal_client.py index 3db144cad0..17f12c7b3f 100644 --- a/src/oci/demand_signal/occ_demand_signal_client.py +++ b/src/oci/demand_signal/occ_demand_signal_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_occ_demand_signal_compartment(self, occ_demand_signal_id, change_occ_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_occ_demand_signal_compartment got unknown kwargs: {extra_kwargs!r}") @@ -188,10 +187,10 @@ def change_occ_demand_signal_compartment(self, occ_demand_signal_id, change_occ_ "occDemandSignalId": occ_demand_signal_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_occ_demand_signal_compartment(self, occ_demand_signal_id, change_occ_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_occ_demand_signal(self, create_occ_demand_signal_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_occ_demand_signal got unknown kwargs: {extra_kwargs!r}") @@ -300,7 +299,7 @@ def create_occ_demand_signal(self, create_occ_demand_signal_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'), @@ -391,7 +390,7 @@ def delete_occ_demand_signal(self, occ_demand_signal_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_demand_signal got unknown kwargs: {extra_kwargs!r}") @@ -400,10 +399,10 @@ def delete_occ_demand_signal(self, occ_demand_signal_id, **kwargs): "occDemandSignalId": occ_demand_signal_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_occ_demand_signal(self, occ_demand_signal_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -493,7 +492,7 @@ def get_occ_demand_signal(self, occ_demand_signal_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_demand_signal got unknown kwargs: {extra_kwargs!r}") @@ -502,10 +501,10 @@ def get_occ_demand_signal(self, occ_demand_signal_id, **kwargs): "occDemandSignalId": occ_demand_signal_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -513,7 +512,7 @@ def get_occ_demand_signal(self, occ_demand_signal_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_occ_demand_signals(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_occ_demand_signals got unknown kwargs: {extra_kwargs!r}") @@ -679,14 +678,14 @@ def list_occ_demand_signals(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'), @@ -779,7 +778,7 @@ def patch_occ_demand_signal(self, occ_demand_signal_id, patch_occ_demand_signal_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_demand_signal got unknown kwargs: {extra_kwargs!r}") @@ -788,10 +787,10 @@ def patch_occ_demand_signal(self, occ_demand_signal_id, patch_occ_demand_signal_ "occDemandSignalId": occ_demand_signal_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -800,7 +799,7 @@ def patch_occ_demand_signal(self, occ_demand_signal_id, patch_occ_demand_signal_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 update_occ_demand_signal(self, occ_demand_signal_id, update_occ_demand_signa "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_demand_signal got unknown kwargs: {extra_kwargs!r}") @@ -904,10 +903,10 @@ def update_occ_demand_signal(self, occ_demand_signal_id, update_occ_demand_signa "occDemandSignalId": occ_demand_signal_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -916,7 +915,7 @@ def update_occ_demand_signal(self, occ_demand_signal_id, update_occ_demand_signa "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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/desktops/desktop_service_client.py b/src/oci/desktops/desktop_service_client.py index 62d98f25a5..216de776e8 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 @@ -164,7 +163,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}") @@ -173,10 +172,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 = { @@ -185,7 +184,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 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}") @@ -281,10 +280,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 = { @@ -294,7 +293,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'), @@ -377,7 +376,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}") @@ -388,7 +387,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'), @@ -471,7 +470,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}") @@ -480,10 +479,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 = { @@ -492,7 +491,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'), @@ -576,7 +575,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}") @@ -585,16 +584,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", @@ -602,7 +601,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'), @@ -680,7 +679,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}") @@ -689,10 +688,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 = { @@ -700,7 +699,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'), @@ -778,7 +777,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}") @@ -787,10 +786,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 = { @@ -798,7 +797,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'), @@ -876,7 +875,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}") @@ -885,10 +884,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 = { @@ -896,7 +895,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'), @@ -1013,7 +1012,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}") @@ -1022,10 +1021,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: @@ -1053,14 +1052,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'), @@ -1179,7 +1178,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}") @@ -1188,10 +1187,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: @@ -1219,14 +1218,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'), @@ -1342,7 +1341,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}") @@ -1372,14 +1371,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'), @@ -1497,7 +1496,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}") @@ -1528,14 +1527,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'), @@ -1633,7 +1632,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}") @@ -1642,10 +1641,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: @@ -1668,14 +1667,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'), @@ -1775,7 +1774,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}") @@ -1784,10 +1783,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: @@ -1810,14 +1809,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'), @@ -1931,7 +1930,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}") @@ -1967,14 +1966,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'), @@ -2060,7 +2059,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}") @@ -2069,10 +2068,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 = { @@ -2082,7 +2081,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'), @@ -2167,7 +2166,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}") @@ -2176,10 +2175,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 = { @@ -2189,7 +2188,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'), @@ -2278,7 +2277,7 @@ def stop_desktop(self, desktop_id, **kwargs): "opc_retry_token", "is_soft_stop" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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}") @@ -2287,16 +2286,16 @@ 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') query_params = { "isSoftStop": kwargs.get("is_soft_stop", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2305,7 +2304,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'), @@ -2392,7 +2391,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}") @@ -2401,10 +2400,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 = { @@ -2414,7 +2413,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'), @@ -2498,7 +2497,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}") @@ -2507,10 +2506,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 = { @@ -2519,7 +2518,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'), @@ -2604,7 +2603,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}") @@ -2613,10 +2612,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 = { @@ -2625,7 +2624,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 1a3be4573d..d206c03c3e 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 @@ -172,7 +171,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}") @@ -181,10 +180,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 = { @@ -194,7 +193,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'), @@ -286,7 +285,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}") @@ -295,10 +294,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 = { @@ -308,7 +307,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'), @@ -400,7 +399,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}") @@ -409,10 +408,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 = { @@ -422,7 +421,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'), @@ -511,7 +510,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}") @@ -520,10 +519,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 = { @@ -533,7 +532,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'), @@ -621,7 +620,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}") @@ -630,10 +629,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 = { @@ -643,7 +642,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'), @@ -726,7 +725,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}") @@ -737,7 +736,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'), @@ -820,7 +819,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}") @@ -831,7 +830,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'), @@ -918,7 +917,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}") @@ -930,7 +929,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'), @@ -1013,7 +1012,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}") @@ -1024,7 +1023,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'), @@ -1107,7 +1106,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}") @@ -1118,7 +1117,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'), @@ -1201,7 +1200,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}") @@ -1212,7 +1211,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'), @@ -1295,7 +1294,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}") @@ -1306,7 +1305,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'), @@ -1389,7 +1388,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}") @@ -1400,7 +1399,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'), @@ -1483,7 +1482,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}") @@ -1494,7 +1493,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'), @@ -1584,7 +1583,7 @@ def create_or_update_git_ref(self, repository_id, create_or_update_git_ref_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"create_or_update_git_ref got unknown kwargs: {extra_kwargs!r}") @@ -1593,10 +1592,10 @@ def create_or_update_git_ref(self, repository_id, create_or_update_git_ref_detai "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 = { @@ -1606,7 +1605,7 @@ def create_or_update_git_ref(self, repository_id, create_or_update_git_ref_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} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1698,7 +1697,7 @@ def create_or_update_protected_branch(self, repository_id, create_or_update_prot "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_update_protected_branch got unknown kwargs: {extra_kwargs!r}") @@ -1707,10 +1706,10 @@ def create_or_update_protected_branch(self, repository_id, create_or_update_prot "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 = { @@ -1720,7 +1719,7 @@ def create_or_update_protected_branch(self, repository_id, create_or_update_prot "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_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}") @@ -1816,7 +1815,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'), @@ -1899,7 +1898,7 @@ def create_pull_request(self, create_pull_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_pull_request got unknown kwargs: {extra_kwargs!r}") @@ -1910,7 +1909,7 @@ def create_pull_request(self, create_pull_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'), @@ -2007,7 +2006,7 @@ def create_pull_request_attachment(self, pull_request_id, content_disposition, 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"create_pull_request_attachment got unknown kwargs: {extra_kwargs!r}") @@ -2016,10 +2015,10 @@ def create_pull_request_attachment(self, pull_request_id, content_disposition, c "pullRequestId": pull_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 create_pull_request_attachment(self, pull_request_id, content_disposition, 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} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -2037,7 +2036,7 @@ def create_pull_request_attachment(self, pull_request_id, content_disposition, c create_pull_request_attachment_body = kwargs.get("create_pull_request_attachment_body", missing) if create_pull_request_attachment_body is not missing and create_pull_request_attachment_body is not None: - if (not isinstance(create_pull_request_attachment_body, (six.binary_type, six.string_types)) and + if (not isinstance(create_pull_request_attachment_body, (bytes, str)) and not hasattr(create_pull_request_attachment_body, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -2137,7 +2136,7 @@ def create_pull_request_comment(self, pull_request_id, create_pull_request_comme "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_pull_request_comment got unknown kwargs: {extra_kwargs!r}") @@ -2146,10 +2145,10 @@ def create_pull_request_comment(self, pull_request_id, create_pull_request_comme "pullRequestId": pull_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2158,7 +2157,7 @@ def create_pull_request_comment(self, pull_request_id, create_pull_request_comme "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2243,7 +2242,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}") @@ -2254,7 +2253,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'), @@ -2337,7 +2336,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}") @@ -2348,7 +2347,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'), @@ -2431,7 +2430,7 @@ def decline_pull_request(self, pull_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"decline_pull_request got unknown kwargs: {extra_kwargs!r}") @@ -2440,10 +2439,10 @@ def decline_pull_request(self, pull_request_id, **kwargs): "pullRequestId": pull_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2452,7 +2451,7 @@ def decline_pull_request(self, pull_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'), @@ -2534,7 +2533,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}") @@ -2543,10 +2542,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 = { @@ -2555,7 +2554,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'), @@ -2635,7 +2634,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}") @@ -2644,10 +2643,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 = { @@ -2656,7 +2655,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'), @@ -2736,7 +2735,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}") @@ -2745,10 +2744,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 = { @@ -2757,7 +2756,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'), @@ -2837,7 +2836,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}") @@ -2846,10 +2845,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 = { @@ -2858,7 +2857,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'), @@ -2938,7 +2937,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}") @@ -2947,10 +2946,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 = { @@ -2959,7 +2958,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'), @@ -3039,7 +3038,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}") @@ -3048,10 +3047,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 = { @@ -3060,7 +3059,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'), @@ -3140,7 +3139,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}") @@ -3149,10 +3148,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 = { @@ -3161,7 +3160,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'), @@ -3248,7 +3247,7 @@ def delete_git_ref(self, repository_id, delete_git_ref_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"delete_git_ref got unknown kwargs: {extra_kwargs!r}") @@ -3257,10 +3256,10 @@ def delete_git_ref(self, repository_id, delete_git_ref_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 = { @@ -3270,7 +3269,7 @@ def delete_git_ref(self, repository_id, delete_git_ref_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'), @@ -3353,7 +3352,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}") @@ -3362,10 +3361,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 = { @@ -3374,7 +3373,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'), @@ -3458,7 +3457,7 @@ def delete_project_repository_settings(self, project_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_project_repository_settings got unknown kwargs: {extra_kwargs!r}") @@ -3467,10 +3466,10 @@ def delete_project_repository_settings(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 = { @@ -3480,7 +3479,7 @@ def delete_project_repository_settings(self, project_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'), @@ -3568,7 +3567,7 @@ def delete_protected_branch(self, repository_id, delete_protected_branch_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"delete_protected_branch got unknown kwargs: {extra_kwargs!r}") @@ -3577,10 +3576,10 @@ def delete_protected_branch(self, repository_id, delete_protected_branch_details "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 = { @@ -3590,7 +3589,7 @@ def delete_protected_branch(self, repository_id, delete_protected_branch_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'), @@ -3673,7 +3672,7 @@ def delete_pull_request(self, pull_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_pull_request got unknown kwargs: {extra_kwargs!r}") @@ -3682,10 +3681,10 @@ def delete_pull_request(self, pull_request_id, **kwargs): "pullRequestId": pull_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3694,7 +3693,7 @@ def delete_pull_request(self, pull_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'), @@ -3777,7 +3776,7 @@ def delete_pull_request_attachment(self, pull_request_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_pull_request_attachment got unknown kwargs: {extra_kwargs!r}") @@ -3787,10 +3786,10 @@ def delete_pull_request_attachment(self, pull_request_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 = { @@ -3799,7 +3798,7 @@ def delete_pull_request_attachment(self, pull_request_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'), @@ -3882,7 +3881,7 @@ def delete_pull_request_comment(self, pull_request_id, comment_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_pull_request_comment got unknown kwargs: {extra_kwargs!r}") @@ -3892,10 +3891,10 @@ def delete_pull_request_comment(self, pull_request_id, comment_id, **kwargs): "commentId": comment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3904,7 +3903,7 @@ def delete_pull_request_comment(self, pull_request_id, comment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3991,7 +3990,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}") @@ -4001,10 +4000,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 = { @@ -4014,7 +4013,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'), @@ -4095,7 +4094,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}") @@ -4104,10 +4103,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 = { @@ -4116,7 +4115,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'), @@ -4200,7 +4199,7 @@ def delete_repository_settings(self, repository_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_repository_settings got unknown kwargs: {extra_kwargs!r}") @@ -4209,10 +4208,10 @@ def delete_repository_settings(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 = { @@ -4222,7 +4221,7 @@ def delete_repository_settings(self, repository_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'), @@ -4303,7 +4302,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}") @@ -4312,10 +4311,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 = { @@ -4324,7 +4323,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'), @@ -4400,7 +4399,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}") @@ -4409,10 +4408,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 = { @@ -4420,7 +4419,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'), @@ -4498,7 +4497,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}") @@ -4507,10 +4506,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 = { @@ -4518,7 +4517,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'), @@ -4596,7 +4595,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}") @@ -4605,10 +4604,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 = { @@ -4616,7 +4615,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'), @@ -4697,7 +4696,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}") @@ -4707,10 +4706,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 = { @@ -4718,7 +4717,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'), @@ -4811,7 +4810,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}") @@ -4820,10 +4819,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 = { @@ -4832,14 +4831,14 @@ def get_commit_diff(self, repository_id, target_version, **kwargs): "targetRepositoryId": kwargs.get("target_repository_id", missing), "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'), @@ -4919,7 +4918,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}") @@ -4928,10 +4927,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 = { @@ -4939,7 +4938,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'), @@ -5017,7 +5016,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}") @@ -5026,10 +5025,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 = { @@ -5037,7 +5036,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'), @@ -5115,7 +5114,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}") @@ -5124,10 +5123,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 = { @@ -5135,7 +5134,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'), @@ -5213,7 +5212,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}") @@ -5222,10 +5221,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 = { @@ -5233,7 +5232,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'), @@ -5311,7 +5310,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}") @@ -5320,10 +5319,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 = { @@ -5331,7 +5330,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'), @@ -5409,7 +5408,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}") @@ -5418,10 +5417,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 = { @@ -5429,7 +5428,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'), @@ -5520,7 +5519,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}") @@ -5530,10 +5529,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 = { @@ -5541,14 +5540,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'), @@ -5635,7 +5634,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}") @@ -5645,10 +5644,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 = { @@ -5656,7 +5655,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'), @@ -5742,7 +5741,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}") @@ -5751,24 +5750,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'), @@ -5855,7 +5854,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}") @@ -5865,23 +5864,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'), @@ -5961,7 +5960,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}") @@ -5970,10 +5969,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 = { @@ -5981,7 +5980,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'), @@ -6062,7 +6061,7 @@ def get_project_notification_preference(self, project_id, principal_id, **kwargs "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_notification_preference got unknown kwargs: {extra_kwargs!r}") @@ -6072,10 +6071,10 @@ def get_project_notification_preference(self, project_id, principal_id, **kwargs "principalId": principal_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6083,7 +6082,7 @@ def get_project_notification_preference(self, project_id, principal_id, **kwargs "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6161,7 +6160,7 @@ def get_project_repository_settings(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_repository_settings got unknown kwargs: {extra_kwargs!r}") @@ -6170,10 +6169,10 @@ def get_project_repository_settings(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 = { @@ -6181,7 +6180,7 @@ def get_project_repository_settings(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'), @@ -6259,7 +6258,7 @@ def get_pull_request(self, pull_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_pull_request got unknown kwargs: {extra_kwargs!r}") @@ -6268,10 +6267,10 @@ def get_pull_request(self, pull_request_id, **kwargs): "pullRequestId": pull_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6279,7 +6278,7 @@ def get_pull_request(self, pull_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'), @@ -6360,7 +6359,7 @@ def get_pull_request_attachment(self, pull_request_id, 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_pull_request_attachment got unknown kwargs: {extra_kwargs!r}") @@ -6370,10 +6369,10 @@ def get_pull_request_attachment(self, pull_request_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') header_params = { @@ -6381,7 +6380,7 @@ def get_pull_request_attachment(self, pull_request_id, 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'), @@ -6462,7 +6461,7 @@ def get_pull_request_attachment_content(self, pull_request_id, 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_pull_request_attachment_content got unknown kwargs: {extra_kwargs!r}") @@ -6472,10 +6471,10 @@ def get_pull_request_attachment_content(self, pull_request_id, attachment_id, ** "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 = { @@ -6483,7 +6482,7 @@ def get_pull_request_attachment_content(self, pull_request_id, 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'), @@ -6561,7 +6560,7 @@ def get_pull_request_change_summary_metrics(self, pull_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_pull_request_change_summary_metrics got unknown kwargs: {extra_kwargs!r}") @@ -6570,10 +6569,10 @@ def get_pull_request_change_summary_metrics(self, pull_request_id, **kwargs): "pullRequestId": pull_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6581,7 +6580,7 @@ def get_pull_request_change_summary_metrics(self, pull_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'), @@ -6662,7 +6661,7 @@ def get_pull_request_comment(self, pull_request_id, comment_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_pull_request_comment got unknown kwargs: {extra_kwargs!r}") @@ -6672,10 +6671,10 @@ def get_pull_request_comment(self, pull_request_id, comment_id, **kwargs): "commentId": comment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -6683,7 +6682,7 @@ def get_pull_request_comment(self, pull_request_id, comment_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_pull_request_notification_preference(self, pull_request_id, principal_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_pull_request_notification_preference got unknown kwargs: {extra_kwargs!r}") @@ -6774,10 +6773,10 @@ def get_pull_request_notification_preference(self, pull_request_id, principal_id "principalId": principal_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_pull_request_notification_preference(self, pull_request_id, principal_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'), @@ -6866,7 +6865,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}") @@ -6876,10 +6875,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 = { @@ -6887,7 +6886,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'), @@ -6979,7 +6978,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}") @@ -6988,10 +6987,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 = { @@ -7000,14 +6999,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'), @@ -7102,7 +7101,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}") @@ -7111,10 +7110,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 = { @@ -7123,14 +7122,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'), @@ -7216,7 +7215,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}") @@ -7225,10 +7224,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: @@ -7242,14 +7241,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'), @@ -7337,7 +7336,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}") @@ -7346,24 +7345,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'), @@ -7457,7 +7456,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}") @@ -7467,10 +7466,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 = { @@ -7478,14 +7477,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'), @@ -7568,7 +7567,7 @@ def get_repository_notification_preference(self, repository_id, principal_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_repository_notification_preference got unknown kwargs: {extra_kwargs!r}") @@ -7578,10 +7577,10 @@ def get_repository_notification_preference(self, repository_id, principal_id, ** "principalId": principal_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7589,7 +7588,7 @@ def get_repository_notification_preference(self, repository_id, principal_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'), @@ -7667,7 +7666,7 @@ def get_repository_settings(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_settings got unknown kwargs: {extra_kwargs!r}") @@ -7676,10 +7675,10 @@ def get_repository_settings(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 = { @@ -7687,7 +7686,7 @@ def get_repository_settings(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'), @@ -7765,7 +7764,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}") @@ -7774,10 +7773,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 = { @@ -7785,7 +7784,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'), @@ -7863,7 +7862,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}") @@ -7872,10 +7871,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 = { @@ -7883,7 +7882,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'), @@ -7968,7 +7967,7 @@ def like_pull_request_comment(self, pull_request_id, comment_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"like_pull_request_comment got unknown kwargs: {extra_kwargs!r}") @@ -7978,10 +7977,10 @@ def like_pull_request_comment(self, pull_request_id, comment_id, **kwargs): "commentId": comment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -7990,7 +7989,7 @@ def like_pull_request_comment(self, pull_request_id, comment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8086,7 +8085,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}") @@ -8095,10 +8094,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: @@ -8114,14 +8113,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'), @@ -8240,7 +8239,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}") @@ -8277,14 +8276,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'), @@ -8401,7 +8400,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}") @@ -8438,14 +8437,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'), @@ -8555,7 +8554,7 @@ def list_build_run_snapshots(self, pull_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_build_run_snapshots got unknown kwargs: {extra_kwargs!r}") @@ -8564,10 +8563,10 @@ def list_build_run_snapshots(self, pull_request_id, **kwargs): "pullRequestId": pull_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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: @@ -8593,14 +8592,14 @@ def list_build_run_snapshots(self, pull_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'), @@ -8723,7 +8722,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}") @@ -8761,14 +8760,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'), @@ -8868,7 +8867,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}") @@ -8877,10 +8876,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 = { @@ -8891,14 +8890,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'), @@ -9014,7 +9013,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}") @@ -9023,10 +9022,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 = { @@ -9040,14 +9039,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'), @@ -9172,7 +9171,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}") @@ -9217,14 +9216,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'), @@ -9341,7 +9340,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}") @@ -9378,14 +9377,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'), @@ -9502,7 +9501,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}") @@ -9539,14 +9538,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'), @@ -9663,7 +9662,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}") @@ -9700,14 +9699,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'), @@ -9824,7 +9823,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}") @@ -9861,14 +9860,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'), @@ -10001,7 +10000,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}") @@ -10041,14 +10040,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'), @@ -10133,7 +10132,7 @@ def list_fork_sync_statuses(self, repository_id, branch_name_query_param, **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"list_fork_sync_statuses got unknown kwargs: {extra_kwargs!r}") @@ -10142,16 +10141,16 @@ def list_fork_sync_statuses(self, repository_id, branch_name_query_param, **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 = { "branchNameQueryParam": branch_name_query_param } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -10159,7 +10158,7 @@ def list_fork_sync_statuses(self, repository_id, branch_name_query_param, **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'), @@ -10253,7 +10252,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}") @@ -10262,10 +10261,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: @@ -10280,14 +10279,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'), @@ -10404,7 +10403,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}") @@ -10413,10 +10412,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: @@ -10443,14 +10442,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'), @@ -10550,7 +10549,7 @@ def list_project_commit_analytics_authors(self, project_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_project_commit_analytics_authors got unknown kwargs: {extra_kwargs!r}") @@ -10559,10 +10558,10 @@ def list_project_commit_analytics_authors(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') if 'sort_order' in kwargs: @@ -10585,14 +10584,14 @@ def list_project_commit_analytics_authors(self, project_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10706,7 +10705,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}") @@ -10742,14 +10741,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'), @@ -10851,7 +10850,7 @@ def list_protected_branches(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_protected_branches got unknown kwargs: {extra_kwargs!r}") @@ -10860,10 +10859,10 @@ def list_protected_branches(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: @@ -10887,14 +10886,14 @@ def list_protected_branches(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'), @@ -10994,7 +10993,7 @@ def list_pull_request_activities(self, pull_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_pull_request_activities got unknown kwargs: {extra_kwargs!r}") @@ -11003,10 +11002,10 @@ def list_pull_request_activities(self, pull_request_id, **kwargs): "pullRequestId": pull_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') if 'activity_type' in kwargs: @@ -11029,14 +11028,14 @@ def list_pull_request_activities(self, pull_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'), @@ -11144,7 +11143,7 @@ def list_pull_request_attachments(self, pull_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_pull_request_attachments got unknown kwargs: {extra_kwargs!r}") @@ -11153,10 +11152,10 @@ def list_pull_request_attachments(self, pull_request_id, **kwargs): "pullRequestId": pull_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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: @@ -11181,14 +11180,14 @@ def list_pull_request_attachments(self, pull_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'), @@ -11282,7 +11281,7 @@ def list_pull_request_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_pull_request_authors got unknown kwargs: {extra_kwargs!r}") @@ -11291,10 +11290,10 @@ def list_pull_request_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: @@ -11309,14 +11308,14 @@ def list_pull_request_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'), @@ -11432,7 +11431,7 @@ def list_pull_request_comments(self, pull_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_pull_request_comments got unknown kwargs: {extra_kwargs!r}") @@ -11441,10 +11440,10 @@ def list_pull_request_comments(self, pull_request_id, **kwargs): "pullRequestId": pull_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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: @@ -11471,14 +11470,14 @@ def list_pull_request_comments(self, pull_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'), @@ -11566,7 +11565,7 @@ def list_pull_request_commits(self, pull_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_pull_request_commits got unknown kwargs: {extra_kwargs!r}") @@ -11575,24 +11574,24 @@ def list_pull_request_commits(self, pull_request_id, **kwargs): "pullRequestId": pull_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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'), @@ -11684,7 +11683,7 @@ def list_pull_request_file_changes(self, pull_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_pull_request_file_changes got unknown kwargs: {extra_kwargs!r}") @@ -11693,10 +11692,10 @@ def list_pull_request_file_changes(self, pull_request_id, **kwargs): "pullRequestId": pull_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') query_params = { @@ -11704,14 +11703,14 @@ def list_pull_request_file_changes(self, pull_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'), @@ -11856,7 +11855,7 @@ def list_pull_requests(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_pull_requests got unknown kwargs: {extra_kwargs!r}") @@ -11906,14 +11905,14 @@ def list_pull_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'), @@ -12025,7 +12024,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}") @@ -12034,10 +12033,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: @@ -12070,14 +12069,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'), @@ -12196,7 +12195,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}") @@ -12233,14 +12232,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'), @@ -12338,7 +12337,7 @@ def list_repository_commit_analytics_authors(self, repository_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_repository_commit_analytics_authors got unknown kwargs: {extra_kwargs!r}") @@ -12347,10 +12346,10 @@ def list_repository_commit_analytics_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: @@ -12373,14 +12372,14 @@ def list_repository_commit_analytics_authors(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'), @@ -12499,7 +12498,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}") @@ -12536,14 +12535,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'), @@ -12641,7 +12640,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}") @@ -12650,10 +12649,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: @@ -12676,14 +12675,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'), @@ -12783,7 +12782,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}") @@ -12792,10 +12791,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: @@ -12818,14 +12817,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'), @@ -12943,7 +12942,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}") @@ -12980,14 +12979,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'), @@ -13076,7 +13075,7 @@ def merge_pull_request(self, pull_request_id, merge_pull_request_details, **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"merge_pull_request got unknown kwargs: {extra_kwargs!r}") @@ -13085,10 +13084,10 @@ def merge_pull_request(self, pull_request_id, merge_pull_request_details, **kwar "pullRequestId": pull_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13098,7 +13097,7 @@ def merge_pull_request(self, pull_request_id, merge_pull_request_details, **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'), @@ -13183,7 +13182,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}") @@ -13192,10 +13191,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 = { @@ -13204,7 +13203,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'), @@ -13287,7 +13286,7 @@ def patch_pull_request(self, pull_request_id, patch_pull_request_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"patch_pull_request got unknown kwargs: {extra_kwargs!r}") @@ -13296,10 +13295,10 @@ def patch_pull_request(self, pull_request_id, patch_pull_request_details, **kwar "pullRequestId": pull_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13308,7 +13307,7 @@ def patch_pull_request(self, pull_request_id, patch_pull_request_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'), @@ -13402,7 +13401,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}") @@ -13412,10 +13411,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 = { @@ -13425,7 +13424,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'), @@ -13510,7 +13509,7 @@ def reopen_pull_request(self, pull_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"reopen_pull_request got unknown kwargs: {extra_kwargs!r}") @@ -13519,10 +13518,10 @@ def reopen_pull_request(self, pull_request_id, **kwargs): "pullRequestId": pull_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13531,7 +13530,7 @@ def reopen_pull_request(self, pull_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'), @@ -13616,7 +13615,7 @@ def reopen_pull_request_comment(self, pull_request_id, comment_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"reopen_pull_request_comment got unknown kwargs: {extra_kwargs!r}") @@ -13626,10 +13625,10 @@ def reopen_pull_request_comment(self, pull_request_id, comment_id, **kwargs): "commentId": comment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13638,7 +13637,7 @@ def reopen_pull_request_comment(self, pull_request_id, comment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13723,7 +13722,7 @@ def resolve_pull_request_comment(self, pull_request_id, comment_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"resolve_pull_request_comment got unknown kwargs: {extra_kwargs!r}") @@ -13733,10 +13732,10 @@ def resolve_pull_request_comment(self, pull_request_id, comment_id, **kwargs): "commentId": comment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13745,7 +13744,7 @@ def resolve_pull_request_comment(self, pull_request_id, comment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13834,7 +13833,7 @@ def review_pull_request(self, pull_request_id, review_pull_request_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"review_pull_request got unknown kwargs: {extra_kwargs!r}") @@ -13843,10 +13842,10 @@ def review_pull_request(self, pull_request_id, review_pull_request_details, **kw "pullRequestId": pull_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -13856,7 +13855,7 @@ def review_pull_request(self, pull_request_id, review_pull_request_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'), @@ -13945,7 +13944,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}") @@ -13954,10 +13953,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 = { @@ -13967,7 +13966,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'), @@ -14055,7 +14054,7 @@ def summarize_project_repository_analytics(self, project_id, summarize_project_r "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_project_repository_analytics got unknown kwargs: {extra_kwargs!r}") @@ -14064,24 +14063,24 @@ def summarize_project_repository_analytics(self, project_id, summarize_project_r "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') 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'), @@ -14174,7 +14173,7 @@ def summarize_repository_analytics(self, repository_id, summarize_repository_ana "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_repository_analytics got unknown kwargs: {extra_kwargs!r}") @@ -14183,24 +14182,24 @@ def summarize_repository_analytics(self, repository_id, summarize_repository_ana "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 = { "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'), @@ -14299,7 +14298,7 @@ def sync_repository(self, repository_id, sync_merge_strategy, sync_repository_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"sync_repository got unknown kwargs: {extra_kwargs!r}") @@ -14308,10 +14307,10 @@ def sync_repository(self, repository_id, sync_merge_strategy, sync_repository_de "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') sync_merge_strategy_allowed_values = ["FETCH_AND_MERGE", "DISCARD"] @@ -14323,7 +14322,7 @@ def sync_repository(self, repository_id, sync_merge_strategy, sync_repository_de query_params = { "syncMergeStrategy": sync_merge_strategy } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -14332,7 +14331,7 @@ def sync_repository(self, repository_id, sync_merge_strategy, sync_repository_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'), @@ -14417,7 +14416,7 @@ def trigger_deployment_dry_run(self, trigger_deployment_dry_run_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"trigger_deployment_dry_run got unknown kwargs: {extra_kwargs!r}") @@ -14428,7 +14427,7 @@ def trigger_deployment_dry_run(self, trigger_deployment_dry_run_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'), @@ -14514,7 +14513,7 @@ def unlike_pull_request_comment(self, pull_request_id, comment_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"unlike_pull_request_comment got unknown kwargs: {extra_kwargs!r}") @@ -14524,10 +14523,10 @@ def unlike_pull_request_comment(self, pull_request_id, comment_id, **kwargs): "commentId": comment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -14536,7 +14535,7 @@ def unlike_pull_request_comment(self, pull_request_id, comment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14621,7 +14620,7 @@ def unsubscribe_pull_request(self, pull_request_id, token, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"unsubscribe_pull_request got unknown kwargs: {extra_kwargs!r}") @@ -14630,16 +14629,16 @@ def unsubscribe_pull_request(self, pull_request_id, token, **kwargs): "pullRequestId": pull_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + 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/html", @@ -14647,7 +14646,7 @@ def unsubscribe_pull_request(self, pull_request_id, token, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -14734,7 +14733,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}") @@ -14743,10 +14742,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 = { @@ -14755,7 +14754,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'), @@ -14842,7 +14841,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}") @@ -14851,10 +14850,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 = { @@ -14863,7 +14862,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'), @@ -14950,7 +14949,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}") @@ -14959,10 +14958,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 = { @@ -14971,7 +14970,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'), @@ -15058,7 +15057,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}") @@ -15067,10 +15066,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 = { @@ -15079,7 +15078,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'), @@ -15166,7 +15165,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}") @@ -15175,10 +15174,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 = { @@ -15187,7 +15186,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'), @@ -15274,7 +15273,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}") @@ -15283,10 +15282,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 = { @@ -15295,7 +15294,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'), @@ -15382,7 +15381,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}") @@ -15391,10 +15390,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 = { @@ -15403,7 +15402,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'), @@ -15490,7 +15489,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}") @@ -15499,10 +15498,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 = { @@ -15511,7 +15510,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'), @@ -15598,7 +15597,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}") @@ -15607,10 +15606,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 = { @@ -15619,7 +15618,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'), @@ -15706,7 +15705,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}") @@ -15715,10 +15714,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 = { @@ -15727,7 +15726,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'), @@ -15817,7 +15816,7 @@ def update_project_notification_preference(self, update_project_notification_pre "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_notification_preference got unknown kwargs: {extra_kwargs!r}") @@ -15827,10 +15826,10 @@ def update_project_notification_preference(self, update_project_notification_pre "principalId": principal_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -15839,7 +15838,7 @@ def update_project_notification_preference(self, update_project_notification_pre "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -15930,7 +15929,7 @@ def update_project_repository_settings(self, project_id, update_project_reposito "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_repository_settings got unknown kwargs: {extra_kwargs!r}") @@ -15939,10 +15938,10 @@ def update_project_repository_settings(self, project_id, update_project_reposito "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 = { @@ -15952,7 +15951,7 @@ def update_project_repository_settings(self, project_id, update_project_reposito "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16040,7 +16039,7 @@ def update_pull_request(self, pull_request_id, update_pull_request_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_pull_request got unknown kwargs: {extra_kwargs!r}") @@ -16049,10 +16048,10 @@ def update_pull_request(self, pull_request_id, update_pull_request_details, **kw "pullRequestId": pull_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16061,7 +16060,7 @@ def update_pull_request(self, pull_request_id, update_pull_request_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'), @@ -16151,7 +16150,7 @@ def update_pull_request_comment(self, pull_request_id, comment_id, update_pull_r "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_pull_request_comment got unknown kwargs: {extra_kwargs!r}") @@ -16161,10 +16160,10 @@ def update_pull_request_comment(self, pull_request_id, comment_id, update_pull_r "commentId": comment_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16173,7 +16172,7 @@ def update_pull_request_comment(self, pull_request_id, comment_id, update_pull_r "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16263,7 +16262,7 @@ def update_pull_request_notification_preference(self, update_pull_request_notifi "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_pull_request_notification_preference got unknown kwargs: {extra_kwargs!r}") @@ -16273,10 +16272,10 @@ def update_pull_request_notification_preference(self, update_pull_request_notifi "principalId": principal_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16285,7 +16284,7 @@ def update_pull_request_notification_preference(self, update_pull_request_notifi "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16372,7 +16371,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}") @@ -16381,10 +16380,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 = { @@ -16393,7 +16392,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'), @@ -16483,7 +16482,7 @@ def update_repository_notification_preference(self, update_repository_notificati "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_notification_preference got unknown kwargs: {extra_kwargs!r}") @@ -16493,10 +16492,10 @@ def update_repository_notification_preference(self, update_repository_notificati "principalId": principal_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -16505,7 +16504,7 @@ def update_repository_notification_preference(self, update_repository_notificati "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16596,7 +16595,7 @@ def update_repository_settings(self, repository_id, update_repository_settings_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"update_repository_settings got unknown kwargs: {extra_kwargs!r}") @@ -16605,10 +16604,10 @@ def update_repository_settings(self, repository_id, update_repository_settings_d "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 = { @@ -16618,7 +16617,7 @@ def update_repository_settings(self, repository_id, update_repository_settings_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'), @@ -16706,7 +16705,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}") @@ -16715,10 +16714,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 = { @@ -16727,7 +16726,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'), @@ -16815,7 +16814,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}") @@ -16824,10 +16823,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 = { @@ -16837,7 +16836,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/dif/stack_client.py b/src/oci/dif/stack_client.py index f1ea11d4e7..c08b88cc15 100644 --- a/src/oci/dif/stack_client.py +++ b/src/oci/dif/stack_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 add_service(self, stack_id, add_service_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_service got unknown kwargs: {extra_kwargs!r}") @@ -184,10 +183,10 @@ def add_service(self, stack_id, add_service_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 = { @@ -196,7 +195,7 @@ def add_service(self, stack_id, add_service_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'), @@ -286,7 +285,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}") @@ -295,10 +294,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 = { @@ -307,7 +306,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'), @@ -401,7 +400,7 @@ def change_stack_compartment(self, stack_id, change_stack_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_stack_compartment got unknown kwargs: {extra_kwargs!r}") @@ -410,10 +409,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 = { @@ -422,7 +421,7 @@ def change_stack_compartment(self, stack_id, change_stack_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'), @@ -511,7 +510,7 @@ def create_stack(self, create_stack_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_stack got unknown kwargs: {extra_kwargs!r}") @@ -522,7 +521,7 @@ def create_stack(self, create_stack_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'), @@ -613,7 +612,7 @@ def delete_stack(self, stack_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -622,10 +621,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 = { @@ -634,7 +633,7 @@ def delete_stack(self, stack_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 deploy_artifacts(self, stack_id, deploy_artifacts_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"deploy_artifacts got unknown kwargs: {extra_kwargs!r}") @@ -742,10 +741,10 @@ def deploy_artifacts(self, stack_id, deploy_artifacts_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 = { @@ -755,7 +754,7 @@ def deploy_artifacts(self, stack_id, deploy_artifacts_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'), @@ -839,7 +838,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}") @@ -848,10 +847,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 = { @@ -859,7 +858,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'), @@ -942,7 +941,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}") @@ -951,10 +950,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 = { @@ -962,7 +961,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'), @@ -1092,7 +1091,7 @@ def list_stacks(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_stacks got unknown kwargs: {extra_kwargs!r}") @@ -1128,14 +1127,14 @@ def list_stacks(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'), @@ -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'), @@ -1401,7 +1400,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}") @@ -1410,10 +1409,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: @@ -1436,14 +1435,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'), @@ -1575,7 +1574,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}") @@ -1611,14 +1610,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'), @@ -1711,7 +1710,7 @@ def update_stack(self, stack_id, update_stack_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_stack got unknown kwargs: {extra_kwargs!r}") @@ -1720,10 +1719,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 = { @@ -1732,7 +1731,7 @@ def update_stack(self, stack_id, update_stack_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/disaster_recovery/disaster_recovery_client.py b/src/oci/disaster_recovery/disaster_recovery_client.py index 24fa5dc30a..d42d5100d7 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 @@ -185,7 +184,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}") @@ -194,10 +193,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 = { @@ -207,7 +206,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'), @@ -307,7 +306,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}") @@ -316,10 +315,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 = { @@ -329,7 +328,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'), @@ -418,7 +417,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}") @@ -427,10 +426,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 = { @@ -439,7 +438,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'), @@ -536,7 +535,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}") @@ -545,10 +544,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 = { @@ -558,7 +557,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'), @@ -645,7 +644,7 @@ def create_automatic_dr_configuration(self, create_automatic_dr_configuration_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_automatic_dr_configuration got unknown kwargs: {extra_kwargs!r}") @@ -656,7 +655,7 @@ def create_automatic_dr_configuration(self, create_automatic_dr_configuration_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'), @@ -743,7 +742,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}") @@ -754,7 +753,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'), @@ -841,7 +840,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}") @@ -852,7 +851,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'), @@ -939,7 +938,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}") @@ -950,7 +949,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'), @@ -1039,7 +1038,7 @@ def delete_automatic_dr_configuration(self, automatic_dr_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_automatic_dr_configuration got unknown kwargs: {extra_kwargs!r}") @@ -1048,10 +1047,10 @@ def delete_automatic_dr_configuration(self, automatic_dr_configuration_id, **kwa "automaticDrConfigurationId": automatic_dr_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 = { @@ -1060,7 +1059,7 @@ def delete_automatic_dr_configuration(self, automatic_dr_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'), @@ -1146,7 +1145,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}") @@ -1155,10 +1154,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 = { @@ -1167,7 +1166,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'), @@ -1253,7 +1252,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}") @@ -1262,10 +1261,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 = { @@ -1274,7 +1273,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'), @@ -1360,7 +1359,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}") @@ -1369,10 +1368,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 = { @@ -1381,7 +1380,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'), @@ -1479,7 +1478,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}") @@ -1488,10 +1487,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 = { @@ -1501,7 +1500,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'), @@ -1582,7 +1581,7 @@ def get_automatic_dr_configuration(self, automatic_dr_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_automatic_dr_configuration got unknown kwargs: {extra_kwargs!r}") @@ -1591,10 +1590,10 @@ def get_automatic_dr_configuration(self, automatic_dr_configuration_id, **kwargs "automaticDrConfigurationId": automatic_dr_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 = { @@ -1602,7 +1601,7 @@ def get_automatic_dr_configuration(self, automatic_dr_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'), @@ -1682,7 +1681,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}") @@ -1691,10 +1690,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 = { @@ -1702,7 +1701,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'), @@ -1782,7 +1781,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}") @@ -1791,10 +1790,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 = { @@ -1802,7 +1801,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'), @@ -1882,7 +1881,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}") @@ -1891,10 +1890,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 = { @@ -1902,7 +1901,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'), @@ -1982,7 +1981,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}") @@ -1991,10 +1990,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 = { @@ -2002,7 +2001,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'), @@ -2101,7 +2100,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}") @@ -2110,10 +2109,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 = { @@ -2123,7 +2122,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'), @@ -2266,7 +2265,7 @@ def list_automatic_dr_configurations(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_automatic_dr_configurations got unknown kwargs: {extra_kwargs!r}") @@ -2310,14 +2309,14 @@ def list_automatic_dr_configurations(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'), @@ -2453,7 +2452,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}") @@ -2489,14 +2488,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'), @@ -2644,7 +2643,7 @@ def list_dr_plans(self, dr_protection_group_id, **kwargs): "opc_request_id", "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_plans got unknown kwargs: {extra_kwargs!r}") @@ -2696,14 +2695,14 @@ def list_dr_plans(self, dr_protection_group_id, **kwargs): "sortBy": kwargs.get("sort_by", 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'), @@ -2851,7 +2850,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}") @@ -2903,14 +2902,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'), @@ -3026,7 +3025,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}") @@ -3035,10 +3034,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: @@ -3061,14 +3060,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'), @@ -3186,7 +3185,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}") @@ -3195,10 +3194,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: @@ -3221,14 +3220,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'), @@ -3365,7 +3364,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}") @@ -3401,14 +3400,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'), @@ -3507,7 +3506,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}") @@ -3516,10 +3515,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 = { @@ -3529,7 +3528,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'), @@ -3629,7 +3628,7 @@ def refresh_dr_plan(self, refresh_dr_plan_details, dr_plan_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"refresh_dr_plan got unknown kwargs: {extra_kwargs!r}") @@ -3638,10 +3637,10 @@ def refresh_dr_plan(self, refresh_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 = { @@ -3651,7 +3650,7 @@ def refresh_dr_plan(self, refresh_dr_plan_details, dr_plan_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'), @@ -3751,7 +3750,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}") @@ -3760,10 +3759,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 = { @@ -3773,7 +3772,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'), @@ -3873,7 +3872,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}") @@ -3882,10 +3881,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 = { @@ -3895,7 +3894,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'), @@ -3987,7 +3986,7 @@ def update_automatic_dr_configuration(self, update_automatic_dr_configuration_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_automatic_dr_configuration got unknown kwargs: {extra_kwargs!r}") @@ -3996,10 +3995,10 @@ def update_automatic_dr_configuration(self, update_automatic_dr_configuration_de "automaticDrConfigurationId": automatic_dr_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 = { @@ -4008,7 +4007,7 @@ def update_automatic_dr_configuration(self, update_automatic_dr_configuration_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'), @@ -4099,7 +4098,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}") @@ -4108,10 +4107,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 = { @@ -4120,7 +4119,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'), @@ -4211,7 +4210,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}") @@ -4220,10 +4219,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 = { @@ -4232,7 +4231,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'), @@ -4323,7 +4322,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}") @@ -4332,10 +4331,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 = { @@ -4344,7 +4343,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'), @@ -4443,7 +4442,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}") @@ -4452,10 +4451,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 = { @@ -4465,7 +4464,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'), @@ -4565,7 +4564,7 @@ def verify_dr_plan(self, verify_dr_plan_details, dr_plan_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"verify_dr_plan got unknown kwargs: {extra_kwargs!r}") @@ -4574,10 +4573,10 @@ def verify_dr_plan(self, verify_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 = { @@ -4587,7 +4586,7 @@ def verify_dr_plan(self, verify_dr_plan_details, dr_plan_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/distributed_database/distributed_autonomous_db_service_client.py b/src/oci/distributed_database/distributed_autonomous_db_service_client.py index 36330c1431..2748cc3a18 100644 --- a/src/oci/distributed_database/distributed_autonomous_db_service_client.py +++ b/src/oci/distributed_database/distributed_autonomous_db_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_distributed_autonomous_database_gds_control_node(self, distributed_auton "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_distributed_autonomous_database_gds_control_node got unknown kwargs: {extra_kwargs!r}") @@ -188,10 +187,10 @@ def add_distributed_autonomous_database_gds_control_node(self, distributed_auton "distributedAutonomousDatabaseId": distributed_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 = { @@ -201,7 +200,7 @@ def add_distributed_autonomous_database_gds_control_node(self, distributed_auton "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'), @@ -299,7 +298,7 @@ def change_distributed_autonomous_database_compartment(self, change_distributed_ "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_distributed_autonomous_database_compartment got unknown kwargs: {extra_kwargs!r}") @@ -308,10 +307,10 @@ def change_distributed_autonomous_database_compartment(self, change_distributed_ "distributedAutonomousDatabaseId": distributed_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 = { @@ -321,7 +320,7 @@ def change_distributed_autonomous_database_compartment(self, change_distributed_ "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'), @@ -419,7 +418,7 @@ def change_distributed_autonomous_db_backup_config(self, distributed_autonomous_ "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_distributed_autonomous_db_backup_config got unknown kwargs: {extra_kwargs!r}") @@ -428,10 +427,10 @@ def change_distributed_autonomous_db_backup_config(self, distributed_autonomous_ "distributedAutonomousDatabaseId": distributed_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 = { @@ -441,7 +440,7 @@ def change_distributed_autonomous_db_backup_config(self, distributed_autonomous_ "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'), @@ -539,7 +538,7 @@ def configure_distributed_autonomous_database_gsms(self, configure_distributed_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"configure_distributed_autonomous_database_gsms got unknown kwargs: {extra_kwargs!r}") @@ -548,10 +547,10 @@ def configure_distributed_autonomous_database_gsms(self, configure_distributed_a "distributedAutonomousDatabaseId": distributed_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 = { @@ -561,7 +560,7 @@ def configure_distributed_autonomous_database_gsms(self, configure_distributed_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'), @@ -665,7 +664,7 @@ def configure_distributed_autonomous_database_sharding(self, distributed_autonom "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_distributed_autonomous_database_sharding got unknown kwargs: {extra_kwargs!r}") @@ -674,16 +673,16 @@ def configure_distributed_autonomous_database_sharding(self, distributed_autonom "distributedAutonomousDatabaseId": distributed_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 = { "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", @@ -692,7 +691,7 @@ def configure_distributed_autonomous_database_sharding(self, distributed_autonom "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -779,7 +778,7 @@ def create_distributed_autonomous_database(self, create_distributed_autonomous_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_distributed_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -790,7 +789,7 @@ def create_distributed_autonomous_database(self, create_distributed_autonomous_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'), @@ -885,7 +884,7 @@ def delete_distributed_autonomous_database(self, distributed_autonomous_database "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_distributed_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -894,10 +893,10 @@ def delete_distributed_autonomous_database(self, distributed_autonomous_database "distributedAutonomousDatabaseId": distributed_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 = { @@ -907,7 +906,7 @@ def delete_distributed_autonomous_database(self, distributed_autonomous_database "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'), @@ -1003,7 +1002,7 @@ def download_distributed_autonomous_database_gsm_certificate_signing_request(sel "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_distributed_autonomous_database_gsm_certificate_signing_request got unknown kwargs: {extra_kwargs!r}") @@ -1012,10 +1011,10 @@ def download_distributed_autonomous_database_gsm_certificate_signing_request(sel "distributedAutonomousDatabaseId": distributed_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 = { @@ -1025,7 +1024,7 @@ def download_distributed_autonomous_database_gsm_certificate_signing_request(sel "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 generate_distributed_autonomous_database_gsm_certificate_signing_request(sel "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_distributed_autonomous_database_gsm_certificate_signing_request got unknown kwargs: {extra_kwargs!r}") @@ -1134,16 +1133,16 @@ def generate_distributed_autonomous_database_gsm_certificate_signing_request(sel "distributedAutonomousDatabaseId": distributed_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 = { "caBundleId": ca_bundle_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", @@ -1152,7 +1151,7 @@ def generate_distributed_autonomous_database_gsm_certificate_signing_request(sel "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'), @@ -1250,7 +1249,7 @@ def generate_distributed_autonomous_database_wallet(self, distributed_autonomous "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_distributed_autonomous_database_wallet got unknown kwargs: {extra_kwargs!r}") @@ -1259,10 +1258,10 @@ def generate_distributed_autonomous_database_wallet(self, distributed_autonomous "distributedAutonomousDatabaseId": distributed_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 = { @@ -1272,7 +1271,7 @@ def generate_distributed_autonomous_database_wallet(self, distributed_autonomous "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'), @@ -1365,7 +1364,7 @@ def get_distributed_autonomous_database(self, distributed_autonomous_database_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_distributed_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -1374,16 +1373,16 @@ def get_distributed_autonomous_database(self, distributed_autonomous_database_id "distributedAutonomousDatabaseId": distributed_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 = { "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", @@ -1391,7 +1390,7 @@ def get_distributed_autonomous_database(self, distributed_autonomous_database_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'), @@ -1511,7 +1510,7 @@ def list_distributed_autonomous_databases(self, compartment_id, **kwargs): "db_deployment_type", "metadata" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_distributed_autonomous_databases got unknown kwargs: {extra_kwargs!r}") @@ -1555,14 +1554,14 @@ def list_distributed_autonomous_databases(self, compartment_id, **kwargs): "dbDeploymentType": kwargs.get("db_deployment_type", missing), "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'), @@ -1661,7 +1660,7 @@ def patch_distributed_autonomous_database(self, distributed_autonomous_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"patch_distributed_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -1670,10 +1669,10 @@ def patch_distributed_autonomous_database(self, distributed_autonomous_database_ "distributedAutonomousDatabaseId": distributed_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 = { @@ -1683,7 +1682,7 @@ def patch_distributed_autonomous_database(self, distributed_autonomous_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'), @@ -1778,7 +1777,7 @@ def rotate_distributed_autonomous_database_passwords(self, distributed_autonomou "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"rotate_distributed_autonomous_database_passwords got unknown kwargs: {extra_kwargs!r}") @@ -1787,10 +1786,10 @@ def rotate_distributed_autonomous_database_passwords(self, distributed_autonomou "distributedAutonomousDatabaseId": distributed_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 = { @@ -1800,7 +1799,7 @@ def rotate_distributed_autonomous_database_passwords(self, distributed_autonomou "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'), @@ -1893,7 +1892,7 @@ def start_distributed_autonomous_database(self, distributed_autonomous_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"start_distributed_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -1902,10 +1901,10 @@ def start_distributed_autonomous_database(self, distributed_autonomous_database_ "distributedAutonomousDatabaseId": distributed_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 = { @@ -1915,7 +1914,7 @@ def start_distributed_autonomous_database(self, distributed_autonomous_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'), @@ -2008,7 +2007,7 @@ def stop_distributed_autonomous_database(self, distributed_autonomous_database_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"stop_distributed_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -2017,10 +2016,10 @@ def stop_distributed_autonomous_database(self, distributed_autonomous_database_i "distributedAutonomousDatabaseId": distributed_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 = { @@ -2030,7 +2029,7 @@ def stop_distributed_autonomous_database(self, distributed_autonomous_database_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'), @@ -2118,7 +2117,7 @@ def update_distributed_autonomous_database(self, distributed_autonomous_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"update_distributed_autonomous_database got unknown kwargs: {extra_kwargs!r}") @@ -2127,10 +2126,10 @@ def update_distributed_autonomous_database(self, distributed_autonomous_database "distributedAutonomousDatabaseId": distributed_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 = { @@ -2139,7 +2138,7 @@ def update_distributed_autonomous_database(self, distributed_autonomous_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'), @@ -2241,7 +2240,7 @@ def upload_distributed_autonomous_database_signed_certificate_and_generate_walle "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_distributed_autonomous_database_signed_certificate_and_generate_wallet got unknown kwargs: {extra_kwargs!r}") @@ -2250,10 +2249,10 @@ def upload_distributed_autonomous_database_signed_certificate_and_generate_walle "distributedAutonomousDatabaseId": distributed_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 = { @@ -2263,7 +2262,7 @@ def upload_distributed_autonomous_database_signed_certificate_and_generate_walle "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'), @@ -2370,7 +2369,7 @@ def validate_distributed_autonomous_database_network(self, distributed_autonomou "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_distributed_autonomous_database_network got unknown kwargs: {extra_kwargs!r}") @@ -2379,10 +2378,10 @@ def validate_distributed_autonomous_database_network(self, distributed_autonomou "distributedAutonomousDatabaseId": distributed_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 = { @@ -2390,7 +2389,7 @@ def validate_distributed_autonomous_database_network(self, distributed_autonomou "resourceName": kwargs.get("resource_name", missing), "shardGroup": kwargs.get("shard_group", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2399,7 +2398,7 @@ def validate_distributed_autonomous_database_network(self, distributed_autonomou "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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/distributed_database/distributed_db_private_endpoint_service_client.py b/src/oci/distributed_database/distributed_db_private_endpoint_service_client.py index 79b0f4276e..65b40b7213 100644 --- a/src/oci/distributed_database/distributed_db_private_endpoint_service_client.py +++ b/src/oci/distributed_database/distributed_db_private_endpoint_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 change_distributed_database_private_endpoint_compartment(self, change_distri "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_distributed_database_private_endpoint_compartment got unknown kwargs: {extra_kwargs!r}") @@ -188,10 +187,10 @@ def change_distributed_database_private_endpoint_compartment(self, change_distri "distributedDatabasePrivateEndpointId": distributed_database_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 = { @@ -201,7 +200,7 @@ def change_distributed_database_private_endpoint_compartment(self, change_distri "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'), @@ -288,7 +287,7 @@ def create_distributed_database_private_endpoint(self, create_distributed_databa "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_distributed_database_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -299,7 +298,7 @@ def create_distributed_database_private_endpoint(self, create_distributed_databa "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 delete_distributed_database_private_endpoint(self, distributed_database_priv "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_distributed_database_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -403,10 +402,10 @@ def delete_distributed_database_private_endpoint(self, distributed_database_priv "distributedDatabasePrivateEndpointId": distributed_database_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 = { @@ -416,7 +415,7 @@ def delete_distributed_database_private_endpoint(self, distributed_database_priv "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'), @@ -501,7 +500,7 @@ def get_distributed_database_private_endpoint(self, distributed_database_private "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_distributed_database_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -510,10 +509,10 @@ def get_distributed_database_private_endpoint(self, distributed_database_private "distributedDatabasePrivateEndpointId": distributed_database_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 = { @@ -522,7 +521,7 @@ def get_distributed_database_private_endpoint(self, distributed_database_private "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'), @@ -630,7 +629,7 @@ def list_distributed_database_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_distributed_database_private_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -665,14 +664,14 @@ def list_distributed_database_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'), @@ -766,7 +765,7 @@ def reinstate_proxy_instance(self, distributed_database_private_endpoint_id, **k "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"reinstate_proxy_instance got unknown kwargs: {extra_kwargs!r}") @@ -775,10 +774,10 @@ def reinstate_proxy_instance(self, distributed_database_private_endpoint_id, **k "distributedDatabasePrivateEndpointId": distributed_database_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 = { @@ -788,7 +787,7 @@ def reinstate_proxy_instance(self, distributed_database_private_endpoint_id, **k "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'), @@ -884,7 +883,7 @@ def update_distributed_database_private_endpoint(self, distributed_database_priv "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_distributed_database_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -893,10 +892,10 @@ def update_distributed_database_private_endpoint(self, distributed_database_priv "distributedDatabasePrivateEndpointId": distributed_database_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 = { @@ -906,7 +905,7 @@ def update_distributed_database_private_endpoint(self, distributed_database_priv "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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/distributed_database/distributed_db_service_client.py b/src/oci/distributed_database/distributed_db_service_client.py index c3e7448fd7..b0257b18b8 100644 --- a/src/oci/distributed_database/distributed_db_service_client.py +++ b/src/oci/distributed_database/distributed_db_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_distributed_database_gds_control_node(self, distributed_database_id, add "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_distributed_database_gds_control_node got unknown kwargs: {extra_kwargs!r}") @@ -188,10 +187,10 @@ def add_distributed_database_gds_control_node(self, distributed_database_id, add "distributedDatabaseId": distributed_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 = { @@ -201,7 +200,7 @@ def add_distributed_database_gds_control_node(self, distributed_database_id, add "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'), @@ -299,7 +298,7 @@ def change_distributed_database_compartment(self, change_distributed_database_co "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_distributed_database_compartment got unknown kwargs: {extra_kwargs!r}") @@ -308,10 +307,10 @@ def change_distributed_database_compartment(self, change_distributed_database_co "distributedDatabaseId": distributed_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 = { @@ -321,7 +320,7 @@ def change_distributed_database_compartment(self, change_distributed_database_co "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'), @@ -419,7 +418,7 @@ def change_distributed_db_backup_config(self, distributed_database_id, change_di "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_distributed_db_backup_config got unknown kwargs: {extra_kwargs!r}") @@ -428,10 +427,10 @@ def change_distributed_db_backup_config(self, distributed_database_id, change_di "distributedDatabaseId": distributed_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 = { @@ -441,7 +440,7 @@ def change_distributed_db_backup_config(self, distributed_database_id, change_di "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'), @@ -539,7 +538,7 @@ def configure_distributed_database_gsms(self, configure_distributed_database_gsm "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_distributed_database_gsms got unknown kwargs: {extra_kwargs!r}") @@ -548,10 +547,10 @@ def configure_distributed_database_gsms(self, configure_distributed_database_gsm "distributedDatabaseId": distributed_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 = { @@ -561,7 +560,7 @@ def configure_distributed_database_gsms(self, configure_distributed_database_gsm "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 configure_distributed_database_sharding(self, distributed_database_id, **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"configure_distributed_database_sharding got unknown kwargs: {extra_kwargs!r}") @@ -674,16 +673,16 @@ def configure_distributed_database_sharding(self, distributed_database_id, **kwa "distributedDatabaseId": distributed_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", @@ -692,7 +691,7 @@ def configure_distributed_database_sharding(self, distributed_database_id, **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'), @@ -779,7 +778,7 @@ def create_distributed_database(self, create_distributed_database_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_distributed_database got unknown kwargs: {extra_kwargs!r}") @@ -790,7 +789,7 @@ def create_distributed_database(self, create_distributed_database_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'), @@ -885,7 +884,7 @@ def delete_distributed_database(self, distributed_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_distributed_database got unknown kwargs: {extra_kwargs!r}") @@ -894,10 +893,10 @@ def delete_distributed_database(self, distributed_database_id, **kwargs): "distributedDatabaseId": distributed_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 = { @@ -907,7 +906,7 @@ def delete_distributed_database(self, distributed_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'), @@ -1003,7 +1002,7 @@ def download_distributed_database_gsm_certificate_signing_request(self, distribu "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_distributed_database_gsm_certificate_signing_request got unknown kwargs: {extra_kwargs!r}") @@ -1012,10 +1011,10 @@ def download_distributed_database_gsm_certificate_signing_request(self, distribu "distributedDatabaseId": distributed_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 = { @@ -1025,7 +1024,7 @@ def download_distributed_database_gsm_certificate_signing_request(self, distribu "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 generate_distributed_database_gsm_certificate_signing_request(self, distribu "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_distributed_database_gsm_certificate_signing_request got unknown kwargs: {extra_kwargs!r}") @@ -1134,16 +1133,16 @@ def generate_distributed_database_gsm_certificate_signing_request(self, distribu "distributedDatabaseId": distributed_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 = { "caBundleId": ca_bundle_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", @@ -1152,7 +1151,7 @@ def generate_distributed_database_gsm_certificate_signing_request(self, distribu "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'), @@ -1250,7 +1249,7 @@ def generate_distributed_database_wallet(self, distributed_database_id, generate "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_distributed_database_wallet got unknown kwargs: {extra_kwargs!r}") @@ -1259,10 +1258,10 @@ def generate_distributed_database_wallet(self, distributed_database_id, generate "distributedDatabaseId": distributed_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 = { @@ -1272,7 +1271,7 @@ def generate_distributed_database_wallet(self, distributed_database_id, generate "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'), @@ -1365,7 +1364,7 @@ def get_distributed_database(self, distributed_database_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_distributed_database got unknown kwargs: {extra_kwargs!r}") @@ -1374,16 +1373,16 @@ def get_distributed_database(self, distributed_database_id, **kwargs): "distributedDatabaseId": distributed_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", @@ -1391,7 +1390,7 @@ def get_distributed_database(self, distributed_database_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'), @@ -1511,7 +1510,7 @@ def list_distributed_databases(self, compartment_id, **kwargs): "db_deployment_type", "metadata" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_distributed_databases got unknown kwargs: {extra_kwargs!r}") @@ -1555,14 +1554,14 @@ def list_distributed_databases(self, compartment_id, **kwargs): "dbDeploymentType": kwargs.get("db_deployment_type", missing), "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'), @@ -1661,7 +1660,7 @@ def patch_distributed_database(self, distributed_database_id, patch_distributed_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_distributed_database got unknown kwargs: {extra_kwargs!r}") @@ -1670,10 +1669,10 @@ def patch_distributed_database(self, distributed_database_id, patch_distributed_ "distributedDatabaseId": distributed_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 = { @@ -1683,7 +1682,7 @@ def patch_distributed_database(self, distributed_database_id, patch_distributed_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1778,7 +1777,7 @@ def rotate_distributed_database_passwords(self, distributed_database_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"rotate_distributed_database_passwords got unknown kwargs: {extra_kwargs!r}") @@ -1787,10 +1786,10 @@ def rotate_distributed_database_passwords(self, distributed_database_id, **kwarg "distributedDatabaseId": distributed_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 = { @@ -1800,7 +1799,7 @@ def rotate_distributed_database_passwords(self, distributed_database_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'), @@ -1893,7 +1892,7 @@ def start_distributed_database(self, distributed_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_distributed_database got unknown kwargs: {extra_kwargs!r}") @@ -1902,10 +1901,10 @@ def start_distributed_database(self, distributed_database_id, **kwargs): "distributedDatabaseId": distributed_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 = { @@ -1915,7 +1914,7 @@ def start_distributed_database(self, distributed_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'), @@ -2008,7 +2007,7 @@ def stop_distributed_database(self, distributed_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_distributed_database got unknown kwargs: {extra_kwargs!r}") @@ -2017,10 +2016,10 @@ def stop_distributed_database(self, distributed_database_id, **kwargs): "distributedDatabaseId": distributed_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 = { @@ -2030,7 +2029,7 @@ def stop_distributed_database(self, distributed_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'), @@ -2118,7 +2117,7 @@ def update_distributed_database(self, distributed_database_id, update_distribute "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_distributed_database got unknown kwargs: {extra_kwargs!r}") @@ -2127,10 +2126,10 @@ def update_distributed_database(self, distributed_database_id, update_distribute "distributedDatabaseId": distributed_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 = { @@ -2139,7 +2138,7 @@ def update_distributed_database(self, distributed_database_id, update_distribute "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 upload_distributed_database_signed_certificate_and_generate_wallet(self, dis "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_distributed_database_signed_certificate_and_generate_wallet got unknown kwargs: {extra_kwargs!r}") @@ -2250,10 +2249,10 @@ def upload_distributed_database_signed_certificate_and_generate_wallet(self, dis "distributedDatabaseId": distributed_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 = { @@ -2263,7 +2262,7 @@ def upload_distributed_database_signed_certificate_and_generate_wallet(self, dis "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'), @@ -2370,7 +2369,7 @@ def validate_distributed_database_network(self, distributed_database_id, **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"validate_distributed_database_network got unknown kwargs: {extra_kwargs!r}") @@ -2379,10 +2378,10 @@ def validate_distributed_database_network(self, distributed_database_id, **kwarg "distributedDatabaseId": distributed_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 = { @@ -2390,7 +2389,7 @@ def validate_distributed_database_network(self, distributed_database_id, **kwarg "resourceName": kwargs.get("resource_name", missing), "shardGroup": kwargs.get("shard_group", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2399,7 +2398,7 @@ def validate_distributed_database_network(self, distributed_database_id, **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'), diff --git a/src/oci/distributed_database/distributed_db_work_request_service_client.py b/src/oci/distributed_database/distributed_db_work_request_service_client.py index 79a2a2c484..a11f90db27 100644 --- a/src/oci/distributed_database/distributed_db_work_request_service_client.py +++ b/src/oci/distributed_database/distributed_db_work_request_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 @@ -160,7 +159,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}") @@ -169,10 +168,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 = { @@ -180,7 +179,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'), @@ -278,7 +277,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}") @@ -287,10 +286,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: @@ -313,14 +312,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'), @@ -420,7 +419,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}") @@ -429,10 +428,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: @@ -455,14 +454,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'), @@ -576,7 +575,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}") @@ -612,14 +611,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/dns/dns_client.py b/src/oci/dns/dns_client.py index 36293848a6..573df1a55f 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 @@ -194,7 +193,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}") @@ -203,10 +202,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: @@ -219,7 +218,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", @@ -228,7 +227,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'), @@ -337,7 +336,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}") @@ -346,10 +345,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: @@ -362,7 +361,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", @@ -371,7 +370,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'), @@ -480,7 +479,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}") @@ -489,10 +488,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: @@ -505,7 +504,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", @@ -514,7 +513,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'), @@ -625,7 +624,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}") @@ -634,10 +633,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: @@ -650,7 +649,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", @@ -659,7 +658,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'), @@ -775,7 +774,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}") @@ -784,10 +783,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: @@ -800,7 +799,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", @@ -809,7 +808,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'), @@ -910,7 +909,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}") @@ -919,10 +918,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: @@ -935,7 +934,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", @@ -943,7 +942,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'), @@ -1046,7 +1045,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}") @@ -1061,7 +1060,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", @@ -1069,7 +1068,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'), @@ -1172,7 +1171,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}") @@ -1187,7 +1186,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", @@ -1195,7 +1194,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'), @@ -1285,7 +1284,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}") @@ -1300,14 +1299,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'), @@ -1404,7 +1403,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}") @@ -1419,7 +1418,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", @@ -1427,7 +1426,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'), @@ -1529,7 +1528,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}") @@ -1546,14 +1545,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'), @@ -1654,7 +1653,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}") @@ -1671,13 +1670,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: @@ -1686,7 +1685,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.') @@ -1816,7 +1815,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}") @@ -1826,10 +1825,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: @@ -1844,7 +1843,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", @@ -1853,7 +1852,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'), @@ -1962,7 +1961,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}") @@ -1972,10 +1971,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: @@ -1988,7 +1987,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", @@ -1997,7 +1996,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'), @@ -2116,7 +2115,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}") @@ -2127,10 +2126,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: @@ -2145,7 +2144,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", @@ -2154,7 +2153,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'), @@ -2260,7 +2259,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}") @@ -2269,10 +2268,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: @@ -2285,7 +2284,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", @@ -2294,7 +2293,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'), @@ -2395,7 +2394,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}") @@ -2404,10 +2403,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: @@ -2420,7 +2419,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", @@ -2429,7 +2428,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'), @@ -2529,7 +2528,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}") @@ -2538,10 +2537,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: @@ -2554,7 +2553,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", @@ -2563,7 +2562,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'), @@ -2668,7 +2667,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}") @@ -2677,10 +2676,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: @@ -2693,7 +2692,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", @@ -2702,7 +2701,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'), @@ -2816,7 +2815,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}") @@ -2825,10 +2824,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: @@ -2843,7 +2842,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", @@ -2852,7 +2851,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'), @@ -2998,7 +2997,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}") @@ -3008,10 +3007,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: @@ -3046,7 +3045,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", @@ -3055,7 +3054,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'), @@ -3160,7 +3159,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}") @@ -3169,10 +3168,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: @@ -3185,7 +3184,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", @@ -3194,7 +3193,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'), @@ -3302,7 +3301,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}") @@ -3312,10 +3311,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: @@ -3328,7 +3327,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", @@ -3337,7 +3336,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'), @@ -3470,7 +3469,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}") @@ -3481,10 +3480,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: @@ -3502,7 +3501,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", @@ -3511,7 +3510,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'), @@ -3613,7 +3612,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}") @@ -3622,10 +3621,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: @@ -3638,7 +3637,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", @@ -3647,7 +3646,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'), @@ -3749,7 +3748,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}") @@ -3758,10 +3757,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: @@ -3774,7 +3773,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", @@ -3783,7 +3782,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'), @@ -3885,7 +3884,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}") @@ -3894,10 +3893,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: @@ -3910,7 +3909,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", @@ -3919,7 +3918,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'), @@ -4025,7 +4024,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}") @@ -4034,10 +4033,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: @@ -4050,7 +4049,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", @@ -4059,7 +4058,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'), @@ -4174,7 +4173,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}") @@ -4183,10 +4182,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: @@ -4201,7 +4200,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", @@ -4210,7 +4209,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'), @@ -4316,7 +4315,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}") @@ -4325,10 +4324,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: @@ -4342,7 +4341,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", @@ -4351,7 +4350,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'), @@ -4511,7 +4510,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}") @@ -4520,10 +4519,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: @@ -4560,7 +4559,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", @@ -4569,7 +4568,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'), @@ -4690,7 +4689,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}") @@ -4699,10 +4698,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: @@ -4742,14 +4741,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'), @@ -4876,7 +4875,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}") @@ -4920,14 +4919,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'), @@ -5076,7 +5075,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}") @@ -5125,14 +5124,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'), @@ -5286,7 +5285,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}") @@ -5336,14 +5335,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'), @@ -5463,7 +5462,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}") @@ -5507,14 +5506,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'), @@ -5639,7 +5638,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}") @@ -5683,14 +5682,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'), @@ -5782,7 +5781,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}") @@ -5799,14 +5798,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'), @@ -5966,7 +5965,7 @@ def list_zones(self, compartment_id, **kwargs): "tsig_key_id", "dnssec_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_zones got unknown kwargs: {extra_kwargs!r}") @@ -6030,14 +6029,14 @@ def list_zones(self, compartment_id, **kwargs): "tsigKeyId": kwargs.get("tsig_key_id", missing), "dnssecState": kwargs.get("dnssec_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'), @@ -6160,7 +6159,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}") @@ -6170,10 +6169,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: @@ -6188,7 +6187,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", @@ -6197,7 +6196,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'), @@ -6325,7 +6324,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}") @@ -6336,10 +6335,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: @@ -6354,7 +6353,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", @@ -6363,7 +6362,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'), @@ -6487,7 +6486,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}") @@ -6496,10 +6495,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: @@ -6514,7 +6513,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", @@ -6523,7 +6522,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'), @@ -6652,7 +6651,7 @@ def promote_zone_dnssec_key_version(self, zone_id, promote_zone_dnssec_key_versi "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"promote_zone_dnssec_key_version got unknown kwargs: {extra_kwargs!r}") @@ -6661,10 +6660,10 @@ def promote_zone_dnssec_key_version(self, zone_id, promote_zone_dnssec_key_versi "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: @@ -6677,7 +6676,7 @@ def promote_zone_dnssec_key_version(self, zone_id, promote_zone_dnssec_key_versi 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", @@ -6687,7 +6686,7 @@ def promote_zone_dnssec_key_version(self, zone_id, promote_zone_dnssec_key_versi "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 stage_zone_dnssec_key_version(self, zone_id, stage_zone_dnssec_key_version_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"stage_zone_dnssec_key_version got unknown kwargs: {extra_kwargs!r}") @@ -6819,10 +6818,10 @@ def stage_zone_dnssec_key_version(self, zone_id, stage_zone_dnssec_key_version_d "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: @@ -6835,7 +6834,7 @@ def stage_zone_dnssec_key_version(self, zone_id, stage_zone_dnssec_key_version_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", @@ -6845,7 +6844,7 @@ def stage_zone_dnssec_key_version(self, zone_id, stage_zone_dnssec_key_version_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'), @@ -6971,7 +6970,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}") @@ -6981,10 +6980,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: @@ -6999,7 +6998,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", @@ -7008,7 +7007,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'), @@ -7117,7 +7116,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}") @@ -7126,10 +7125,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: @@ -7142,7 +7141,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", @@ -7151,7 +7150,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'), @@ -7263,7 +7262,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}") @@ -7273,10 +7272,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: @@ -7289,7 +7288,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", @@ -7298,7 +7297,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'), @@ -7426,7 +7425,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}") @@ -7437,10 +7436,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: @@ -7455,7 +7454,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", @@ -7464,7 +7463,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'), @@ -7573,7 +7572,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}") @@ -7582,10 +7581,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: @@ -7598,7 +7597,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", @@ -7607,7 +7606,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'), @@ -7716,7 +7715,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}") @@ -7725,10 +7724,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: @@ -7741,7 +7740,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", @@ -7750,7 +7749,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'), @@ -7859,7 +7858,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}") @@ -7868,10 +7867,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: @@ -7884,7 +7883,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", @@ -7893,7 +7892,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'), @@ -8002,7 +8001,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}") @@ -8011,10 +8010,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: @@ -8027,7 +8026,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", @@ -8036,7 +8035,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'), @@ -8162,7 +8161,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}") @@ -8171,10 +8170,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: @@ -8189,7 +8188,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", @@ -8198,7 +8197,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'), @@ -8323,7 +8322,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}") @@ -8332,10 +8331,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: @@ -8350,7 +8349,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", @@ -8359,7 +8358,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/em_warehouse/em_warehouse_client.py b/src/oci/em_warehouse/em_warehouse_client.py index 177f7a1a9f..b4be808281 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 @@ -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_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}") @@ -291,10 +290,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 = { @@ -304,7 +303,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'), @@ -389,7 +388,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}") @@ -400,7 +399,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'), @@ -483,7 +482,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}") @@ -492,10 +491,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 = { @@ -504,7 +503,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'), @@ -578,7 +577,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}") @@ -587,10 +586,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 = { @@ -598,7 +597,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'), @@ -674,7 +673,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}") @@ -683,10 +682,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 = { @@ -694,7 +693,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'), @@ -770,7 +769,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}") @@ -779,10 +778,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 = { @@ -790,7 +789,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'), @@ -905,7 +904,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}") @@ -942,14 +941,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'), @@ -1053,7 +1052,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}") @@ -1062,10 +1061,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: @@ -1090,14 +1089,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'), @@ -1195,7 +1194,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}") @@ -1204,10 +1203,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: @@ -1230,14 +1229,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'), @@ -1335,7 +1334,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}") @@ -1344,10 +1343,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: @@ -1370,14 +1369,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'), @@ -1490,7 +1489,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}") @@ -1526,14 +1525,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'), @@ -1620,7 +1619,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}") @@ -1629,10 +1628,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 = { @@ -1641,7 +1640,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 d3ad8269e4..e736294460 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 @@ -175,7 +174,7 @@ def add_email_domain_lock(self, email_domain_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_email_domain_lock got unknown kwargs: {extra_kwargs!r}") @@ -184,10 +183,10 @@ def add_email_domain_lock(self, email_domain_id, add_lock_details, **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 = { @@ -196,7 +195,7 @@ def add_email_domain_lock(self, email_domain_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'), @@ -285,7 +284,7 @@ def add_email_ip_pool_lock(self, email_ip_pool_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_email_ip_pool_lock got unknown kwargs: {extra_kwargs!r}") @@ -294,10 +293,10 @@ def add_email_ip_pool_lock(self, email_ip_pool_id, add_lock_details, **kwargs): "emailIpPoolId": email_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 = { @@ -306,7 +305,7 @@ def add_email_ip_pool_lock(self, email_ip_pool_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'), @@ -403,7 +402,7 @@ def add_email_outbound_ip(self, add_email_outbound_ip_details, email_ip_pool_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"add_email_outbound_ip got unknown kwargs: {extra_kwargs!r}") @@ -412,10 +411,10 @@ def add_email_outbound_ip(self, add_email_outbound_ip_details, email_ip_pool_id, "emailIpPoolId": email_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 = { @@ -425,7 +424,7 @@ def add_email_outbound_ip(self, add_email_outbound_ip_details, email_ip_pool_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'), @@ -513,7 +512,7 @@ def add_return_path_lock(self, email_return_path_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_return_path_lock got unknown kwargs: {extra_kwargs!r}") @@ -522,10 +521,10 @@ def add_return_path_lock(self, email_return_path_id, add_lock_details, **kwargs) "emailReturnPathId": email_return_path_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -534,7 +533,7 @@ def add_return_path_lock(self, email_return_path_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'), @@ -621,7 +620,7 @@ def add_sender_lock(self, sender_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_sender_lock got unknown kwargs: {extra_kwargs!r}") @@ -630,10 +629,10 @@ def add_sender_lock(self, sender_id, add_lock_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 = { @@ -642,7 +641,7 @@ def add_sender_lock(self, sender_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'), @@ -750,7 +749,7 @@ def change_email_domain_compartment(self, email_domain_id, change_email_domain_c "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_email_domain_compartment got unknown kwargs: {extra_kwargs!r}") @@ -759,16 +758,16 @@ 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') 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", @@ -777,7 +776,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'), @@ -879,7 +878,7 @@ def change_email_ip_pool_compartment(self, email_ip_pool_id, change_email_ip_poo "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_email_ip_pool_compartment got unknown kwargs: {extra_kwargs!r}") @@ -888,16 +887,16 @@ def change_email_ip_pool_compartment(self, email_ip_pool_id, change_email_ip_poo "emailIpPoolId": email_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') 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", @@ -906,7 +905,7 @@ def change_email_ip_pool_compartment(self, email_ip_pool_id, change_email_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'), @@ -998,7 +997,7 @@ def change_sender_compartment(self, sender_id, change_sender_compartment_details "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_sender_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1007,16 +1006,16 @@ 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') 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", @@ -1024,7 +1023,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'), @@ -1114,7 +1113,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}") @@ -1125,7 +1124,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'), @@ -1210,7 +1209,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}") @@ -1221,7 +1220,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'), @@ -1306,7 +1305,7 @@ def create_email_ip_pool(self, create_email_ip_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_email_ip_pool got unknown kwargs: {extra_kwargs!r}") @@ -1317,7 +1316,7 @@ def create_email_ip_pool(self, create_email_ip_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'), @@ -1402,7 +1401,7 @@ def create_email_return_path(self, create_email_return_path_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_return_path got unknown kwargs: {extra_kwargs!r}") @@ -1413,7 +1412,7 @@ def create_email_return_path(self, create_email_return_path_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'), @@ -1490,7 +1489,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}") @@ -1500,7 +1499,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'), @@ -1579,7 +1578,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}") @@ -1589,7 +1588,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'), @@ -1678,7 +1677,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}") @@ -1687,10 +1686,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 = { @@ -1699,7 +1698,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'), @@ -1785,7 +1784,7 @@ def delete_email_domain(self, email_domain_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_email_domain got unknown kwargs: {extra_kwargs!r}") @@ -1794,16 +1793,16 @@ 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') 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", @@ -1811,7 +1810,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'), @@ -1899,7 +1898,7 @@ def delete_email_ip_pool(self, email_ip_pool_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_email_ip_pool got unknown kwargs: {extra_kwargs!r}") @@ -1908,16 +1907,16 @@ def delete_email_ip_pool(self, email_ip_pool_id, **kwargs): "emailIpPoolId": email_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') 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", @@ -1925,7 +1924,7 @@ def delete_email_ip_pool(self, email_ip_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'), @@ -2013,7 +2012,7 @@ def delete_email_return_path(self, email_return_path_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_email_return_path got unknown kwargs: {extra_kwargs!r}") @@ -2022,16 +2021,16 @@ def delete_email_return_path(self, email_return_path_id, **kwargs): "emailReturnPathId": email_return_path_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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", @@ -2039,7 +2038,7 @@ def delete_email_return_path(self, email_return_path_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2126,7 +2125,7 @@ def delete_sender(self, sender_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_sender got unknown kwargs: {extra_kwargs!r}") @@ -2135,16 +2134,16 @@ 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') 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", @@ -2152,7 +2151,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'), @@ -2229,7 +2228,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}") @@ -2238,10 +2237,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 = { @@ -2249,7 +2248,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'), @@ -2325,7 +2324,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}") @@ -2334,10 +2333,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 = { @@ -2345,7 +2344,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'), @@ -2421,7 +2420,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}") @@ -2429,14 +2428,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'), @@ -2514,7 +2513,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}") @@ -2523,10 +2522,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 = { @@ -2534,7 +2533,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'), @@ -2612,7 +2611,7 @@ def get_email_ip_pool(self, email_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_email_ip_pool got unknown kwargs: {extra_kwargs!r}") @@ -2621,10 +2620,10 @@ def get_email_ip_pool(self, email_ip_pool_id, **kwargs): "emailIpPoolId": email_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 = { @@ -2632,7 +2631,7 @@ def get_email_ip_pool(self, email_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'), @@ -2710,7 +2709,7 @@ def get_email_return_path(self, email_return_path_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_return_path got unknown kwargs: {extra_kwargs!r}") @@ -2719,10 +2718,10 @@ def get_email_return_path(self, email_return_path_id, **kwargs): "emailReturnPathId": email_return_path_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 get_email_return_path(self, email_return_path_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -2815,10 +2814,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 = { @@ -2826,7 +2825,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'), @@ -2903,7 +2902,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}") @@ -2912,10 +2911,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 = { @@ -2923,7 +2922,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'), @@ -2999,7 +2998,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}") @@ -3008,10 +3007,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 = { @@ -3019,7 +3018,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'), @@ -3145,7 +3144,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}") @@ -3181,14 +3180,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'), @@ -3312,7 +3311,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}") @@ -3348,14 +3347,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'), @@ -3477,7 +3476,7 @@ def list_email_ip_pools(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_email_ip_pools got unknown kwargs: {extra_kwargs!r}") @@ -3513,14 +3512,14 @@ def list_email_ip_pools(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'), @@ -3642,7 +3641,7 @@ def list_email_outbound_ips(self, compartment_id, **kwargs): "assignment_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_outbound_ips got unknown kwargs: {extra_kwargs!r}") @@ -3685,14 +3684,14 @@ def list_email_outbound_ips(self, compartment_id, **kwargs): "assignmentState": kwargs.get("assignment_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'), @@ -3823,7 +3822,7 @@ def list_email_return_paths(self, **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_return_paths got unknown kwargs: {extra_kwargs!r}") @@ -3860,14 +3859,14 @@ def list_email_return_paths(self, **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'), @@ -3992,7 +3991,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}") @@ -4029,14 +4028,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'), @@ -4175,7 +4174,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}") @@ -4204,14 +4203,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'), @@ -4303,7 +4302,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}") @@ -4312,24 +4311,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'), @@ -4423,7 +4422,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}") @@ -4432,24 +4431,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'), @@ -4547,7 +4546,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}") @@ -4558,14 +4557,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'), @@ -4652,7 +4651,7 @@ def remove_email_domain_lock(self, email_domain_id, remove_lock_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"remove_email_domain_lock got unknown kwargs: {extra_kwargs!r}") @@ -4661,10 +4660,10 @@ def remove_email_domain_lock(self, email_domain_id, remove_lock_details, **kwarg "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 = { @@ -4673,7 +4672,7 @@ def remove_email_domain_lock(self, email_domain_id, remove_lock_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'), @@ -4762,7 +4761,7 @@ def remove_email_ip_pool_lock(self, email_ip_pool_id, remove_lock_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"remove_email_ip_pool_lock got unknown kwargs: {extra_kwargs!r}") @@ -4771,10 +4770,10 @@ def remove_email_ip_pool_lock(self, email_ip_pool_id, remove_lock_details, **kwa "emailIpPoolId": email_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 = { @@ -4783,7 +4782,7 @@ def remove_email_ip_pool_lock(self, email_ip_pool_id, remove_lock_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'), @@ -4880,7 +4879,7 @@ def remove_email_outbound_ip(self, remove_email_outbound_ip_details, email_ip_po "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_email_outbound_ip got unknown kwargs: {extra_kwargs!r}") @@ -4889,10 +4888,10 @@ def remove_email_outbound_ip(self, remove_email_outbound_ip_details, email_ip_po "emailIpPoolId": email_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 = { @@ -4902,7 +4901,7 @@ def remove_email_outbound_ip(self, remove_email_outbound_ip_details, email_ip_po "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'), @@ -4990,7 +4989,7 @@ def remove_return_path_lock(self, email_return_path_id, remove_lock_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"remove_return_path_lock got unknown kwargs: {extra_kwargs!r}") @@ -4999,10 +4998,10 @@ def remove_return_path_lock(self, email_return_path_id, remove_lock_details, **k "emailReturnPathId": email_return_path_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 remove_return_path_lock(self, email_return_path_id, remove_lock_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'), @@ -5098,7 +5097,7 @@ def remove_sender_lock(self, sender_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_sender_lock got unknown kwargs: {extra_kwargs!r}") @@ -5107,10 +5106,10 @@ def remove_sender_lock(self, sender_id, remove_lock_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 = { @@ -5119,7 +5118,7 @@ def remove_sender_lock(self, sender_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'), @@ -5208,7 +5207,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}") @@ -5217,10 +5216,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 = { @@ -5229,7 +5228,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'), @@ -5320,7 +5319,7 @@ def update_email_domain(self, email_domain_id, update_email_domain_details, **kw "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_email_domain got unknown kwargs: {extra_kwargs!r}") @@ -5329,16 +5328,16 @@ 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') 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", @@ -5346,7 +5345,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'), @@ -5439,7 +5438,7 @@ def update_email_ip_pool(self, email_ip_pool_id, update_email_ip_pool_details, * "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_email_ip_pool got unknown kwargs: {extra_kwargs!r}") @@ -5448,16 +5447,16 @@ def update_email_ip_pool(self, email_ip_pool_id, update_email_ip_pool_details, * "emailIpPoolId": email_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') 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", @@ -5465,7 +5464,7 @@ def update_email_ip_pool(self, email_ip_pool_id, update_email_ip_pool_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'), @@ -5558,7 +5557,7 @@ def update_email_return_path(self, email_return_path_id, update_email_return_pat "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_email_return_path got unknown kwargs: {extra_kwargs!r}") @@ -5567,16 +5566,16 @@ def update_email_return_path(self, email_return_path_id, update_email_return_pat "emailReturnPathId": email_return_path_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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", @@ -5584,7 +5583,7 @@ def update_email_return_path(self, email_return_path_id, update_email_return_pat "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5680,7 +5679,7 @@ def update_sender(self, sender_id, update_sender_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_sender got unknown kwargs: {extra_kwargs!r}") @@ -5689,16 +5688,16 @@ 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') 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", @@ -5706,7 +5705,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 8392c97905..0b066a6349 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 @@ -162,7 +161,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}") @@ -172,7 +171,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'), @@ -278,7 +277,7 @@ def submit_raw_email(self, content_type, compartment_id, sender, recipients, raw "opc_request_id", "content_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"submit_raw_email got unknown kwargs: {extra_kwargs!r}") @@ -292,7 +291,7 @@ def submit_raw_email(self, content_type, compartment_id, sender, recipients, raw "sender": sender, "recipients": recipients } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v 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: @@ -301,7 +300,7 @@ def submit_raw_email(self, content_type, compartment_id, sender, recipients, raw raw_message = kwargs.get("raw_message", missing) if raw_message is not missing and raw_message is not None: - if (not isinstance(raw_message, (six.binary_type, six.string_types)) and + if (not isinstance(raw_message, (bytes, str)) and not hasattr(raw_message, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') diff --git a/src/oci/encryption/internal/streaming.py b/src/oci/encryption/internal/streaming.py index 52d769e768..d2869d3f4b 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 2cd97b155b..f1c129f358 100644 --- a/src/oci/encryption/internal/utils.py +++ b/src/oci/encryption/internal/utils.py @@ -2,7 +2,6 @@ # Copyright (c) 2016, 2025, 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 a68ab07944..5a16d98746 100644 --- a/src/oci/encryption/key_providers.py +++ b/src/oci/encryption/key_providers.py @@ -2,7 +2,6 @@ # Copyright (c) 2016, 2025, 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 0e7f35c81e..d73672590d 100644 --- a/src/oci/encryption/models.py +++ b/src/oci/encryption/models.py @@ -2,7 +2,6 @@ # Copyright (c) 2016, 2025, 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 7cffc8cd88..369f353035 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 @@ -183,7 +182,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}") @@ -192,10 +191,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 = { @@ -205,7 +204,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'), @@ -291,7 +290,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}") @@ -302,7 +301,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'), @@ -388,7 +387,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}") @@ -397,10 +396,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 = { @@ -409,7 +408,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'), @@ -486,7 +485,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}") @@ -495,10 +494,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 = { @@ -506,7 +505,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'), @@ -634,7 +633,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}") @@ -669,14 +668,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'), @@ -764,7 +763,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}") @@ -773,10 +772,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 = { @@ -785,7 +784,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 400b6198b3..af64757101 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 @@ -176,7 +175,7 @@ def add_export_lock(self, export_id, add_export_lock_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_export_lock got unknown kwargs: {extra_kwargs!r}") @@ -185,10 +184,10 @@ def add_export_lock(self, export_id, add_export_lock_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 = { @@ -197,7 +196,7 @@ def add_export_lock(self, export_id, add_export_lock_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 add_file_system_lock(self, file_system_id, add_file_system_lock_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"add_file_system_lock got unknown kwargs: {extra_kwargs!r}") @@ -298,10 +297,10 @@ def add_file_system_lock(self, file_system_id, add_file_system_lock_details, **k "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 = { @@ -310,7 +309,7 @@ def add_file_system_lock(self, file_system_id, add_file_system_lock_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'), @@ -402,7 +401,7 @@ def add_filesystem_snapshot_policy_lock(self, filesystem_snapshot_policy_id, add "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_filesystem_snapshot_policy_lock got unknown kwargs: {extra_kwargs!r}") @@ -411,10 +410,10 @@ def add_filesystem_snapshot_policy_lock(self, filesystem_snapshot_policy_id, add "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 = { @@ -423,7 +422,7 @@ def add_filesystem_snapshot_policy_lock(self, filesystem_snapshot_policy_id, add "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 add_mount_target_lock(self, mount_target_id, add_mount_target_lock_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"add_mount_target_lock got unknown kwargs: {extra_kwargs!r}") @@ -524,10 +523,10 @@ def add_mount_target_lock(self, mount_target_id, add_mount_target_lock_details, "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 = { @@ -536,7 +535,7 @@ def add_mount_target_lock(self, mount_target_id, add_mount_target_lock_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'), @@ -628,7 +627,7 @@ def add_outbound_connector_lock(self, outbound_connector_id, add_outbound_connec "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_outbound_connector_lock got unknown kwargs: {extra_kwargs!r}") @@ -637,10 +636,10 @@ def add_outbound_connector_lock(self, outbound_connector_id, add_outbound_connec "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 = { @@ -649,7 +648,7 @@ def add_outbound_connector_lock(self, outbound_connector_id, add_outbound_connec "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 add_replication_lock(self, replication_id, add_replication_lock_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"add_replication_lock got unknown kwargs: {extra_kwargs!r}") @@ -750,10 +749,10 @@ def add_replication_lock(self, replication_id, add_replication_lock_details, **k "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 = { @@ -762,7 +761,7 @@ def add_replication_lock(self, replication_id, add_replication_lock_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'), @@ -854,7 +853,7 @@ def add_snapshot_lock(self, snapshot_id, add_snapshot_lock_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_snapshot_lock got unknown kwargs: {extra_kwargs!r}") @@ -863,10 +862,10 @@ def add_snapshot_lock(self, snapshot_id, add_snapshot_lock_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 = { @@ -875,7 +874,7 @@ def add_snapshot_lock(self, snapshot_id, add_snapshot_lock_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'), @@ -964,7 +963,7 @@ def cancel_downgrade_shape_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"cancel_downgrade_shape_mount_target got unknown kwargs: {extra_kwargs!r}") @@ -973,10 +972,10 @@ def cancel_downgrade_shape_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 = { @@ -985,7 +984,7 @@ def cancel_downgrade_shape_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'), @@ -1081,7 +1080,7 @@ def change_file_system_compartment(self, file_system_id, change_file_system_comp "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_file_system_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1090,16 +1089,16 @@ 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') 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", @@ -1107,7 +1106,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'), @@ -1205,7 +1204,7 @@ def change_filesystem_snapshot_policy_compartment(self, filesystem_snapshot_poli "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_filesystem_snapshot_policy_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1214,16 +1213,16 @@ 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') 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", @@ -1231,7 +1230,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'), @@ -1329,7 +1328,7 @@ def change_mount_target_compartment(self, mount_target_id, change_mount_target_c "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_mount_target_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1338,16 +1337,16 @@ 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') 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", @@ -1355,7 +1354,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'), @@ -1455,7 +1454,7 @@ def change_outbound_connector_compartment(self, outbound_connector_id, change_ou "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_outbound_connector_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1464,16 +1463,16 @@ 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') 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", @@ -1481,7 +1480,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'), @@ -1580,7 +1579,7 @@ def change_replication_compartment(self, replication_id, change_replication_comp "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_replication_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1589,16 +1588,16 @@ 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') 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", @@ -1606,7 +1605,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'), @@ -1694,7 +1693,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}") @@ -1705,7 +1704,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'), @@ -1824,7 +1823,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}") @@ -1835,7 +1834,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'), @@ -1925,7 +1924,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}") @@ -1936,7 +1935,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'), @@ -2061,7 +2060,7 @@ def create_mount_target(self, create_mount_target_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"create_mount_target got unknown kwargs: {extra_kwargs!r}") @@ -2069,7 +2068,7 @@ def create_mount_target(self, create_mount_target_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", @@ -2077,7 +2076,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'), @@ -2188,7 +2187,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}") @@ -2199,7 +2198,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'), @@ -2299,7 +2298,7 @@ def create_quota_rule(self, create_quota_rule_details, file_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"create_quota_rule got unknown kwargs: {extra_kwargs!r}") @@ -2308,10 +2307,10 @@ def create_quota_rule(self, create_quota_rule_details, 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 = { @@ -2321,7 +2320,7 @@ def create_quota_rule(self, create_quota_rule_details, file_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'), @@ -2440,7 +2439,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}") @@ -2451,7 +2450,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'), @@ -2538,7 +2537,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}") @@ -2549,7 +2548,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'), @@ -2641,7 +2640,7 @@ def delete_export(self, export_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_export got unknown kwargs: {extra_kwargs!r}") @@ -2650,16 +2649,16 @@ 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') 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", @@ -2667,7 +2666,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'), @@ -2765,7 +2764,7 @@ def delete_file_system(self, file_system_id, **kwargs): "is_lock_override", "can_detach_child_file_system" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -2774,17 +2773,17 @@ 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') query_params = { "isLockOverride": kwargs.get("is_lock_override", missing), "canDetachChildFileSystem": kwargs.get("can_detach_child_file_system", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -2792,7 +2791,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'), @@ -2883,7 +2882,7 @@ def delete_filesystem_snapshot_policy(self, filesystem_snapshot_policy_id, **kwa "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_filesystem_snapshot_policy got unknown kwargs: {extra_kwargs!r}") @@ -2892,16 +2891,16 @@ 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') 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", @@ -2909,7 +2908,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'), @@ -3001,7 +3000,7 @@ def delete_mount_target(self, mount_target_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_mount_target got unknown kwargs: {extra_kwargs!r}") @@ -3010,16 +3009,16 @@ 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') 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", @@ -3027,7 +3026,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'), @@ -3118,7 +3117,7 @@ def delete_outbound_connector(self, outbound_connector_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_outbound_connector got unknown kwargs: {extra_kwargs!r}") @@ -3127,16 +3126,16 @@ 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') 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", @@ -3144,7 +3143,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'), @@ -3234,7 +3233,7 @@ def delete_quota_rule(self, file_system_id, quota_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_quota_rule got unknown kwargs: {extra_kwargs!r}") @@ -3244,10 +3243,10 @@ def delete_quota_rule(self, file_system_id, quota_rule_id, **kwargs): "quotaRuleId": quota_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 = { @@ -3256,7 +3255,7 @@ def delete_quota_rule(self, file_system_id, quota_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'), @@ -3354,7 +3353,7 @@ def delete_replication(self, replication_id, **kwargs): "delete_mode", "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_replication got unknown kwargs: {extra_kwargs!r}") @@ -3363,10 +3362,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: @@ -3380,7 +3379,7 @@ def delete_replication(self, replication_id, **kwargs): "deleteMode": kwargs.get("delete_mode", missing), "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", @@ -3388,7 +3387,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'), @@ -3482,7 +3481,7 @@ def delete_replication_target(self, replication_target_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_replication_target got unknown kwargs: {extra_kwargs!r}") @@ -3491,16 +3490,16 @@ 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') 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", @@ -3508,7 +3507,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'), @@ -3599,7 +3598,7 @@ def delete_snapshot(self, snapshot_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_snapshot got unknown kwargs: {extra_kwargs!r}") @@ -3608,16 +3607,16 @@ 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') 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", @@ -3625,7 +3624,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'), @@ -3712,7 +3711,7 @@ def detach_clone(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"detach_clone got unknown kwargs: {extra_kwargs!r}") @@ -3721,10 +3720,10 @@ def detach_clone(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 = { @@ -3733,7 +3732,7 @@ def detach_clone(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'), @@ -3822,7 +3821,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}") @@ -3831,16 +3830,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", @@ -3848,7 +3847,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'), @@ -3929,7 +3928,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}") @@ -3938,10 +3937,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 = { @@ -3949,7 +3948,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'), @@ -4028,7 +4027,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}") @@ -4037,10 +4036,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 = { @@ -4048,7 +4047,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'), @@ -4127,7 +4126,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}") @@ -4136,10 +4135,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 = { @@ -4147,7 +4146,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'), @@ -4226,7 +4225,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}") @@ -4235,10 +4234,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 = { @@ -4246,7 +4245,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'), @@ -4325,7 +4324,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}") @@ -4334,10 +4333,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 = { @@ -4345,7 +4344,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'), @@ -4424,7 +4423,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}") @@ -4433,10 +4432,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 = { @@ -4444,7 +4443,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'), @@ -4534,7 +4533,7 @@ def get_quota_rule(self, file_system_id, quota_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"get_quota_rule got unknown kwargs: {extra_kwargs!r}") @@ -4544,10 +4543,10 @@ def get_quota_rule(self, file_system_id, quota_rule_id, **kwargs): "quotaRuleId": quota_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 = { @@ -4556,7 +4555,7 @@ def get_quota_rule(self, file_system_id, quota_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'), @@ -4635,7 +4634,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}") @@ -4644,10 +4643,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 = { @@ -4655,7 +4654,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'), @@ -4734,7 +4733,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}") @@ -4743,10 +4742,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 = { @@ -4754,7 +4753,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'), @@ -4833,7 +4832,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}") @@ -4842,10 +4841,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 = { @@ -4853,7 +4852,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'), @@ -4997,7 +4996,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}") @@ -5034,14 +5033,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'), @@ -5189,7 +5188,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}") @@ -5226,14 +5225,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'), @@ -5399,7 +5398,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}") @@ -5439,14 +5438,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'), @@ -5590,7 +5589,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}") @@ -5627,14 +5626,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'), @@ -5784,7 +5783,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}") @@ -5822,14 +5821,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'), @@ -5973,7 +5972,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}") @@ -6010,14 +6009,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'), @@ -6152,7 +6151,7 @@ def list_quota_rules(self, file_system_id, principal_type, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_quota_rules got unknown kwargs: {extra_kwargs!r}") @@ -6161,10 +6160,10 @@ def list_quota_rules(self, file_system_id, principal_type, **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') principal_type_allowed_values = ["FILE_SYSTEM_LEVEL", "DEFAULT_GROUP", "DEFAULT_USER", "INDIVIDUAL_GROUP", "INDIVIDUAL_USER"] @@ -6188,7 +6187,7 @@ def list_quota_rules(self, file_system_id, principal_type, **kwargs): "areViolatorsOnly": kwargs.get("are_violators_only", 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", @@ -6196,7 +6195,7 @@ def list_quota_rules(self, file_system_id, principal_type, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6342,7 +6341,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}") @@ -6379,14 +6378,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'), @@ -6536,7 +6535,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}") @@ -6574,14 +6573,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'), @@ -6725,7 +6724,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}") @@ -6754,14 +6753,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'), @@ -6857,7 +6856,7 @@ def pause_filesystem_snapshot_policy(self, filesystem_snapshot_policy_id, **kwar "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"pause_filesystem_snapshot_policy got unknown kwargs: {extra_kwargs!r}") @@ -6866,16 +6865,16 @@ 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') 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", @@ -6883,7 +6882,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'), @@ -6975,7 +6974,7 @@ def remove_export_lock(self, export_id, remove_export_lock_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"remove_export_lock got unknown kwargs: {extra_kwargs!r}") @@ -6984,10 +6983,10 @@ def remove_export_lock(self, export_id, remove_export_lock_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 = { @@ -6996,7 +6995,7 @@ def remove_export_lock(self, export_id, remove_export_lock_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'), @@ -7088,7 +7087,7 @@ def remove_file_system_lock(self, file_system_id, remove_file_system_lock_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"remove_file_system_lock got unknown kwargs: {extra_kwargs!r}") @@ -7097,10 +7096,10 @@ def remove_file_system_lock(self, file_system_id, remove_file_system_lock_detail "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 = { @@ -7109,7 +7108,7 @@ def remove_file_system_lock(self, file_system_id, remove_file_system_lock_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'), @@ -7201,7 +7200,7 @@ def remove_filesystem_snapshot_policy_lock(self, filesystem_snapshot_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"remove_filesystem_snapshot_policy_lock got unknown kwargs: {extra_kwargs!r}") @@ -7210,10 +7209,10 @@ def remove_filesystem_snapshot_policy_lock(self, filesystem_snapshot_policy_id, "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 = { @@ -7222,7 +7221,7 @@ def remove_filesystem_snapshot_policy_lock(self, filesystem_snapshot_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'), @@ -7314,7 +7313,7 @@ def remove_mount_target_lock(self, mount_target_id, remove_mount_target_lock_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"remove_mount_target_lock got unknown kwargs: {extra_kwargs!r}") @@ -7323,10 +7322,10 @@ def remove_mount_target_lock(self, mount_target_id, remove_mount_target_lock_det "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 = { @@ -7335,7 +7334,7 @@ def remove_mount_target_lock(self, mount_target_id, remove_mount_target_lock_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'), @@ -7427,7 +7426,7 @@ def remove_outbound_connector_lock(self, outbound_connector_id, remove_outbound_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_outbound_connector_lock got unknown kwargs: {extra_kwargs!r}") @@ -7436,10 +7435,10 @@ def remove_outbound_connector_lock(self, outbound_connector_id, remove_outbound_ "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 = { @@ -7448,7 +7447,7 @@ def remove_outbound_connector_lock(self, outbound_connector_id, remove_outbound_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7540,7 +7539,7 @@ def remove_replication_lock(self, replication_id, remove_replication_lock_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"remove_replication_lock got unknown kwargs: {extra_kwargs!r}") @@ -7549,10 +7548,10 @@ def remove_replication_lock(self, replication_id, remove_replication_lock_detail "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 = { @@ -7561,7 +7560,7 @@ def remove_replication_lock(self, replication_id, remove_replication_lock_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'), @@ -7653,7 +7652,7 @@ def remove_snapshot_lock(self, snapshot_id, remove_snapshot_lock_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"remove_snapshot_lock got unknown kwargs: {extra_kwargs!r}") @@ -7662,10 +7661,10 @@ def remove_snapshot_lock(self, snapshot_id, remove_snapshot_lock_details, **kwar "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 = { @@ -7674,7 +7673,7 @@ def remove_snapshot_lock(self, snapshot_id, remove_snapshot_lock_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'), @@ -7766,7 +7765,7 @@ def schedule_downgrade_shape_mount_target(self, mount_target_id, schedule_downgr "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_downgrade_shape_mount_target got unknown kwargs: {extra_kwargs!r}") @@ -7775,10 +7774,10 @@ def schedule_downgrade_shape_mount_target(self, mount_target_id, schedule_downgr "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 = { @@ -7787,7 +7786,7 @@ def schedule_downgrade_shape_mount_target(self, mount_target_id, schedule_downgr "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7889,7 +7888,7 @@ def toggle_quota_rules(self, file_system_id, toggle_quota_rules_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"toggle_quota_rules got unknown kwargs: {extra_kwargs!r}") @@ -7898,10 +7897,10 @@ def toggle_quota_rules(self, file_system_id, toggle_quota_rules_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 = { @@ -7911,7 +7910,7 @@ def toggle_quota_rules(self, file_system_id, toggle_quota_rules_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'), @@ -8007,7 +8006,7 @@ def unpause_filesystem_snapshot_policy(self, filesystem_snapshot_policy_id, **kw "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"unpause_filesystem_snapshot_policy got unknown kwargs: {extra_kwargs!r}") @@ -8016,16 +8015,16 @@ 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') 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", @@ -8033,7 +8032,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'), @@ -8129,7 +8128,7 @@ def update_export(self, export_id, update_export_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_export got unknown kwargs: {extra_kwargs!r}") @@ -8138,16 +8137,16 @@ 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') 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", @@ -8155,7 +8154,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'), @@ -8249,7 +8248,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}") @@ -8258,10 +8257,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 = { @@ -8270,7 +8269,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'), @@ -8367,7 +8366,7 @@ def update_file_system(self, file_system_id, update_file_system_details, **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"update_file_system got unknown kwargs: {extra_kwargs!r}") @@ -8376,16 +8375,16 @@ 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') 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", @@ -8393,7 +8392,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'), @@ -8491,7 +8490,7 @@ def update_filesystem_snapshot_policy(self, filesystem_snapshot_policy_id, updat "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_filesystem_snapshot_policy got unknown kwargs: {extra_kwargs!r}") @@ -8500,16 +8499,16 @@ 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') 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", @@ -8517,7 +8516,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'), @@ -8615,7 +8614,7 @@ def update_mount_target(self, mount_target_id, update_mount_target_details, **kw "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_mount_target got unknown kwargs: {extra_kwargs!r}") @@ -8624,16 +8623,16 @@ 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') 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", @@ -8641,7 +8640,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'), @@ -8739,7 +8738,7 @@ def update_outbound_connector(self, outbound_connector_id, update_outbound_conne "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_outbound_connector got unknown kwargs: {extra_kwargs!r}") @@ -8748,16 +8747,16 @@ 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') 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", @@ -8765,7 +8764,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'), @@ -8862,7 +8861,7 @@ def update_quota_rule(self, update_quota_rule_details, file_system_id, quota_rul "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_rule got unknown kwargs: {extra_kwargs!r}") @@ -8872,10 +8871,10 @@ def update_quota_rule(self, update_quota_rule_details, file_system_id, quota_rul "quotaRuleId": quota_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 = { @@ -8884,7 +8883,7 @@ def update_quota_rule(self, update_quota_rule_details, file_system_id, quota_rul "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8980,7 +8979,7 @@ def update_replication(self, replication_id, update_replication_details, **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"update_replication got unknown kwargs: {extra_kwargs!r}") @@ -8989,16 +8988,16 @@ 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') 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", @@ -9006,7 +9005,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'), @@ -9104,7 +9103,7 @@ def update_snapshot(self, snapshot_id, update_snapshot_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_snapshot got unknown kwargs: {extra_kwargs!r}") @@ -9113,16 +9112,16 @@ 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') 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", @@ -9130,7 +9129,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'), @@ -9224,7 +9223,7 @@ def upgrade_shape_mount_target(self, mount_target_id, upgrade_shape_mount_target "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_shape_mount_target got unknown kwargs: {extra_kwargs!r}") @@ -9233,10 +9232,10 @@ def upgrade_shape_mount_target(self, mount_target_id, upgrade_shape_mount_target "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 = { @@ -9245,7 +9244,7 @@ def upgrade_shape_mount_target(self, mount_target_id, upgrade_shape_mount_target "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9326,7 +9325,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}") @@ -9336,7 +9335,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_apps_management/fleet_apps_management_admin_client.py b/src/oci/fleet_apps_management/fleet_apps_management_admin_client.py index 3598d36de7..096d9a6fd0 100644 --- a/src/oci/fleet_apps_management/fleet_apps_management_admin_client.py +++ b/src/oci/fleet_apps_management/fleet_apps_management_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 @@ -182,7 +181,7 @@ def change_platform_configuration_compartment(self, platform_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_platform_configuration_compartment got unknown kwargs: {extra_kwargs!r}") @@ -191,10 +190,10 @@ def change_platform_configuration_compartment(self, platform_configuration_id, c "platformConfigurationId": platform_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 = { @@ -204,7 +203,7 @@ def change_platform_configuration_compartment(self, platform_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'), @@ -305,7 +304,7 @@ def change_property_compartment(self, property_id, change_property_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_property_compartment got unknown kwargs: {extra_kwargs!r}") @@ -314,10 +313,10 @@ def change_property_compartment(self, property_id, change_property_compartment_d "propertyId": property_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 change_property_compartment(self, property_id, change_property_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'), @@ -414,7 +413,7 @@ def create_compliance_policy_rule(self, create_compliance_policy_rule_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_compliance_policy_rule got unknown kwargs: {extra_kwargs!r}") @@ -425,7 +424,7 @@ def create_compliance_policy_rule(self, create_compliance_policy_rule_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'), @@ -513,7 +512,7 @@ def create_onboarding(self, create_onboarding_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_onboarding got unknown kwargs: {extra_kwargs!r}") @@ -524,7 +523,7 @@ def create_onboarding(self, create_onboarding_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'), @@ -611,7 +610,7 @@ def create_platform_configuration(self, create_platform_configuration_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_platform_configuration got unknown kwargs: {extra_kwargs!r}") @@ -622,7 +621,7 @@ def create_platform_configuration(self, create_platform_configuration_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'), @@ -709,7 +708,7 @@ def create_property(self, create_property_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_property got unknown kwargs: {extra_kwargs!r}") @@ -720,7 +719,7 @@ def create_property(self, create_property_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'), @@ -807,7 +806,7 @@ def delete_compliance_policy_rule(self, compliance_policy_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_compliance_policy_rule got unknown kwargs: {extra_kwargs!r}") @@ -816,10 +815,10 @@ def delete_compliance_policy_rule(self, compliance_policy_rule_id, **kwargs): "compliancePolicyRuleId": compliance_policy_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 = { @@ -828,7 +827,7 @@ def delete_compliance_policy_rule(self, compliance_policy_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'), @@ -912,7 +911,7 @@ def delete_onboarding(self, onboarding_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_onboarding got unknown kwargs: {extra_kwargs!r}") @@ -921,10 +920,10 @@ def delete_onboarding(self, onboarding_id, **kwargs): "onboardingId": onboarding_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 delete_onboarding(self, onboarding_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 delete_platform_configuration(self, platform_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_platform_configuration got unknown kwargs: {extra_kwargs!r}") @@ -1026,10 +1025,10 @@ def delete_platform_configuration(self, platform_configuration_id, **kwargs): "platformConfigurationId": platform_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 = { @@ -1038,7 +1037,7 @@ def delete_platform_configuration(self, platform_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'), @@ -1122,7 +1121,7 @@ def delete_property(self, property_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_property got unknown kwargs: {extra_kwargs!r}") @@ -1131,10 +1130,10 @@ def delete_property(self, property_id, **kwargs): "propertyId": property_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_property(self, property_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 enable_latest_policy(self, onboarding_id, enable_latest_policy_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"enable_latest_policy got unknown kwargs: {extra_kwargs!r}") @@ -1247,10 +1246,10 @@ def enable_latest_policy(self, onboarding_id, enable_latest_policy_details, **kw "onboardingId": onboarding_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1260,7 +1259,7 @@ def enable_latest_policy(self, onboarding_id, enable_latest_policy_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'), @@ -1339,7 +1338,7 @@ def get_compliance_policy(self, compliance_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_compliance_policy got unknown kwargs: {extra_kwargs!r}") @@ -1348,10 +1347,10 @@ def get_compliance_policy(self, compliance_policy_id, **kwargs): "compliancePolicyId": compliance_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 = { @@ -1359,7 +1358,7 @@ def get_compliance_policy(self, compliance_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'), @@ -1437,7 +1436,7 @@ def get_compliance_policy_rule(self, compliance_policy_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_compliance_policy_rule got unknown kwargs: {extra_kwargs!r}") @@ -1446,10 +1445,10 @@ def get_compliance_policy_rule(self, compliance_policy_rule_id, **kwargs): "compliancePolicyRuleId": compliance_policy_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 = { @@ -1457,7 +1456,7 @@ def get_compliance_policy_rule(self, compliance_policy_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'), @@ -1535,7 +1534,7 @@ def get_onboarding(self, onboarding_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_onboarding got unknown kwargs: {extra_kwargs!r}") @@ -1544,10 +1543,10 @@ def get_onboarding(self, onboarding_id, **kwargs): "onboardingId": onboarding_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 get_onboarding(self, onboarding_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 get_platform_configuration(self, platform_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_platform_configuration got unknown kwargs: {extra_kwargs!r}") @@ -1642,10 +1641,10 @@ def get_platform_configuration(self, platform_configuration_id, **kwargs): "platformConfigurationId": platform_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 = { @@ -1653,7 +1652,7 @@ def get_platform_configuration(self, platform_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'), @@ -1731,7 +1730,7 @@ def get_property(self, property_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_property got unknown kwargs: {extra_kwargs!r}") @@ -1740,10 +1739,10 @@ def get_property(self, property_id, **kwargs): "propertyId": property_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1751,7 +1750,7 @@ def get_property(self, property_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1874,7 +1873,7 @@ def list_compliance_policies(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_compliance_policies got unknown kwargs: {extra_kwargs!r}") @@ -1918,14 +1917,14 @@ def list_compliance_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'), @@ -2049,7 +2048,7 @@ def list_compliance_policy_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_compliance_policy_rules got unknown kwargs: {extra_kwargs!r}") @@ -2087,14 +2086,14 @@ def list_compliance_policy_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'), @@ -2192,7 +2191,7 @@ def list_onboarding_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_onboarding_policies got unknown kwargs: {extra_kwargs!r}") @@ -2218,14 +2217,14 @@ def list_onboarding_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'), @@ -2337,7 +2336,7 @@ def list_onboardings(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_onboardings got unknown kwargs: {extra_kwargs!r}") @@ -2372,14 +2371,14 @@ def list_onboardings(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'), @@ -2512,7 +2511,7 @@ def list_platform_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_platform_configurations got unknown kwargs: {extra_kwargs!r}") @@ -2565,14 +2564,14 @@ def list_platform_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'), @@ -2700,7 +2699,7 @@ def list_properties(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_properties got unknown kwargs: {extra_kwargs!r}") @@ -2752,14 +2751,14 @@ def list_properties(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'), @@ -2856,7 +2855,7 @@ def manage_settings(self, onboarding_id, manage_settings_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"manage_settings got unknown kwargs: {extra_kwargs!r}") @@ -2865,10 +2864,10 @@ def manage_settings(self, onboarding_id, manage_settings_details, **kwargs): "onboardingId": onboarding_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 manage_settings(self, onboarding_id, manage_settings_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'), @@ -2968,7 +2967,7 @@ def update_compliance_policy_rule(self, compliance_policy_rule_id, update_compli "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_compliance_policy_rule got unknown kwargs: {extra_kwargs!r}") @@ -2977,10 +2976,10 @@ def update_compliance_policy_rule(self, compliance_policy_rule_id, update_compli "compliancePolicyRuleId": compliance_policy_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 = { @@ -2989,7 +2988,7 @@ def update_compliance_policy_rule(self, compliance_policy_rule_id, update_compli "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 update_onboarding(self, onboarding_id, update_onboarding_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_onboarding got unknown kwargs: {extra_kwargs!r}") @@ -3087,10 +3086,10 @@ def update_onboarding(self, onboarding_id, update_onboarding_details, **kwargs): "onboardingId": onboarding_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 update_onboarding(self, onboarding_id, update_onboarding_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'), @@ -3188,7 +3187,7 @@ def update_platform_configuration(self, platform_configuration_id, update_platfo "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_platform_configuration got unknown kwargs: {extra_kwargs!r}") @@ -3197,10 +3196,10 @@ def update_platform_configuration(self, platform_configuration_id, update_platfo "platformConfigurationId": platform_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 = { @@ -3209,7 +3208,7 @@ def update_platform_configuration(self, platform_configuration_id, update_platfo "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 update_property(self, property_id, update_property_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_property got unknown kwargs: {extra_kwargs!r}") @@ -3307,10 +3306,10 @@ def update_property(self, property_id, update_property_details, **kwargs): "propertyId": property_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3319,7 +3318,7 @@ def update_property(self, property_id, update_property_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/fleet_apps_management/fleet_apps_management_catalog_client.py b/src/oci/fleet_apps_management/fleet_apps_management_catalog_client.py index 9505b3b5e1..bc72546ac7 100644 --- a/src/oci/fleet_apps_management/fleet_apps_management_catalog_client.py +++ b/src/oci/fleet_apps_management/fleet_apps_management_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 @@ -184,7 +183,7 @@ def change_catalog_item_compartment(self, catalog_item_id, change_catalog_item_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_catalog_item_compartment got unknown kwargs: {extra_kwargs!r}") @@ -193,10 +192,10 @@ def change_catalog_item_compartment(self, catalog_item_id, change_catalog_item_c "catalogItemId": catalog_item_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 change_catalog_item_compartment(self, catalog_item_id, change_catalog_item_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'), @@ -309,7 +308,7 @@ def clone_catalog_item(self, catalog_item_id, clone_catalog_item_details, **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"clone_catalog_item got unknown kwargs: {extra_kwargs!r}") @@ -318,10 +317,10 @@ def clone_catalog_item(self, catalog_item_id, clone_catalog_item_details, **kwar "catalogItemId": catalog_item_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 clone_catalog_item(self, catalog_item_id, clone_catalog_item_details, **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'), @@ -433,7 +432,7 @@ def configure_catalog_item(self, catalog_item_id, configure_catalog_item_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"configure_catalog_item got unknown kwargs: {extra_kwargs!r}") @@ -442,10 +441,10 @@ def configure_catalog_item(self, catalog_item_id, configure_catalog_item_details "catalogItemId": catalog_item_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -455,7 +454,7 @@ def configure_catalog_item(self, catalog_item_id, configure_catalog_item_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'), @@ -544,7 +543,7 @@ def create_catalog_item(self, create_catalog_item_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_item got unknown kwargs: {extra_kwargs!r}") @@ -555,7 +554,7 @@ def create_catalog_item(self, create_catalog_item_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'), @@ -644,7 +643,7 @@ def delete_catalog_item(self, catalog_item_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_item got unknown kwargs: {extra_kwargs!r}") @@ -653,10 +652,10 @@ def delete_catalog_item(self, catalog_item_id, **kwargs): "catalogItemId": catalog_item_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 delete_catalog_item(self, catalog_item_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 get_catalog_item(self, catalog_item_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_item got unknown kwargs: {extra_kwargs!r}") @@ -752,10 +751,10 @@ def get_catalog_item(self, catalog_item_id, **kwargs): "catalogItemId": catalog_item_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -763,7 +762,7 @@ def get_catalog_item(self, catalog_item_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -843,7 +842,7 @@ def get_catalog_item_variables_definition(self, catalog_item_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_item_variables_definition got unknown kwargs: {extra_kwargs!r}") @@ -852,10 +851,10 @@ def get_catalog_item_variables_definition(self, catalog_item_id, **kwargs): "catalogItemId": catalog_item_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_catalog_item_variables_definition(self, catalog_item_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1000,7 +999,7 @@ def list_catalog_items(self, compartment_id, **kwargs): "package_type", "should_list_public_items" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_items got unknown kwargs: {extra_kwargs!r}") @@ -1054,14 +1053,14 @@ def list_catalog_items(self, compartment_id, **kwargs): "packageType": kwargs.get("package_type", missing), "shouldListPublicItems": kwargs.get("should_list_public_items", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 update_catalog_item(self, catalog_item_id, update_catalog_item_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_catalog_item got unknown kwargs: {extra_kwargs!r}") @@ -1161,10 +1160,10 @@ def update_catalog_item(self, catalog_item_id, update_catalog_item_details, **kw "catalogItemId": catalog_item_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 update_catalog_item(self, catalog_item_id, update_catalog_item_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/fleet_apps_management/fleet_apps_management_client.py b/src/oci/fleet_apps_management/fleet_apps_management_client.py index cbb0484e77..1a5dd68fb0 100644 --- a/src/oci/fleet_apps_management/fleet_apps_management_client.py +++ b/src/oci/fleet_apps_management/fleet_apps_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 @@ -182,7 +181,7 @@ def change_fleet_compartment(self, fleet_id, change_fleet_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_fleet_compartment got unknown kwargs: {extra_kwargs!r}") @@ -191,10 +190,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 = { @@ -204,7 +203,7 @@ def change_fleet_compartment(self, fleet_id, change_fleet_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 check_resource_tagging(self, check_resource_tagging_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"check_resource_tagging got unknown kwargs: {extra_kwargs!r}") @@ -302,7 +301,7 @@ def check_resource_tagging(self, check_resource_tagging_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 confirm_targets(self, confirm_targets_details, fleet_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"confirm_targets got unknown kwargs: {extra_kwargs!r}") @@ -402,10 +401,10 @@ def confirm_targets(self, confirm_targets_details, 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 = { @@ -414,7 +413,7 @@ def confirm_targets(self, confirm_targets_details, fleet_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'), @@ -501,7 +500,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}") @@ -512,7 +511,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'), @@ -602,7 +601,7 @@ def create_fleet_credential(self, create_fleet_credential_details, fleet_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_fleet_credential got unknown kwargs: {extra_kwargs!r}") @@ -611,10 +610,10 @@ def create_fleet_credential(self, create_fleet_credential_details, fleet_id, **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 = { @@ -623,7 +622,7 @@ def create_fleet_credential(self, create_fleet_credential_details, fleet_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'), @@ -715,7 +714,7 @@ def create_fleet_property(self, create_fleet_property_details, fleet_id, **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_fleet_property got unknown kwargs: {extra_kwargs!r}") @@ -724,10 +723,10 @@ def create_fleet_property(self, create_fleet_property_details, fleet_id, **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 = { @@ -736,7 +735,7 @@ def create_fleet_property(self, create_fleet_property_details, fleet_id, **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'), @@ -828,7 +827,7 @@ def create_fleet_resource(self, create_fleet_resource_details, fleet_id, **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_fleet_resource got unknown kwargs: {extra_kwargs!r}") @@ -837,10 +836,10 @@ def create_fleet_resource(self, create_fleet_resource_details, fleet_id, **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 = { @@ -849,7 +848,7 @@ def create_fleet_resource(self, create_fleet_resource_details, fleet_id, **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'), @@ -938,7 +937,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}") @@ -947,10 +946,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 = { @@ -959,7 +958,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'), @@ -1046,7 +1045,7 @@ def delete_fleet_credential(self, fleet_credential_id, 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_credential got unknown kwargs: {extra_kwargs!r}") @@ -1056,10 +1055,10 @@ def delete_fleet_credential(self, fleet_credential_id, 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 = { @@ -1068,7 +1067,7 @@ def delete_fleet_credential(self, fleet_credential_id, 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'), @@ -1155,7 +1154,7 @@ def delete_fleet_property(self, fleet_property_id, 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_property got unknown kwargs: {extra_kwargs!r}") @@ -1165,10 +1164,10 @@ def delete_fleet_property(self, fleet_property_id, 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 = { @@ -1177,7 +1176,7 @@ def delete_fleet_property(self, fleet_property_id, 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'), @@ -1264,7 +1263,7 @@ def delete_fleet_resource(self, fleet_resource_id, 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_resource got unknown kwargs: {extra_kwargs!r}") @@ -1274,10 +1273,10 @@ def delete_fleet_resource(self, fleet_resource_id, 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 = { @@ -1286,7 +1285,7 @@ def delete_fleet_resource(self, fleet_resource_id, 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'), @@ -1373,7 +1372,7 @@ def generate_compliance_report(self, generate_compliance_report_details, fleet_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"generate_compliance_report got unknown kwargs: {extra_kwargs!r}") @@ -1382,10 +1381,10 @@ def generate_compliance_report(self, generate_compliance_report_details, fleet_i "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 = { @@ -1394,7 +1393,7 @@ def generate_compliance_report(self, generate_compliance_report_details, fleet_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'), @@ -1473,7 +1472,7 @@ def get_compliance(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_compliance got unknown kwargs: {extra_kwargs!r}") @@ -1482,10 +1481,10 @@ def get_compliance(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 = { @@ -1493,7 +1492,7 @@ def get_compliance(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'), @@ -1574,7 +1573,7 @@ def get_compliance_report(self, fleet_id, compliance_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_compliance_report got unknown kwargs: {extra_kwargs!r}") @@ -1584,10 +1583,10 @@ def get_compliance_report(self, fleet_id, compliance_report_id, **kwargs): "complianceReportId": compliance_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 = { @@ -1595,7 +1594,7 @@ def get_compliance_report(self, fleet_id, compliance_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'), @@ -1673,7 +1672,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}") @@ -1682,10 +1681,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 = { @@ -1693,7 +1692,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'), @@ -1774,7 +1773,7 @@ def get_fleet_credential(self, fleet_credential_id, 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_credential got unknown kwargs: {extra_kwargs!r}") @@ -1784,10 +1783,10 @@ def get_fleet_credential(self, fleet_credential_id, 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 = { @@ -1795,7 +1794,7 @@ def get_fleet_credential(self, fleet_credential_id, 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'), @@ -1876,7 +1875,7 @@ def get_fleet_property(self, fleet_property_id, 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_property got unknown kwargs: {extra_kwargs!r}") @@ -1886,10 +1885,10 @@ def get_fleet_property(self, fleet_property_id, 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 = { @@ -1897,7 +1896,7 @@ def get_fleet_property(self, fleet_property_id, 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'), @@ -1978,7 +1977,7 @@ def get_fleet_resource(self, fleet_resource_id, 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_resource got unknown kwargs: {extra_kwargs!r}") @@ -1988,10 +1987,10 @@ def get_fleet_resource(self, fleet_resource_id, 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 = { @@ -1999,7 +1998,7 @@ def get_fleet_resource(self, fleet_resource_id, 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'), @@ -2106,7 +2105,7 @@ def list_announcements(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_announcements got unknown kwargs: {extra_kwargs!r}") @@ -2134,14 +2133,14 @@ def list_announcements(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'), @@ -2267,7 +2266,7 @@ def list_fleet_credentials(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_fleet_credentials got unknown kwargs: {extra_kwargs!r}") @@ -2276,10 +2275,10 @@ def list_fleet_credentials(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 'lifecycle_state' in kwargs: @@ -2322,14 +2321,14 @@ def list_fleet_credentials(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'), @@ -2446,7 +2445,7 @@ def list_fleet_products(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_fleet_products got unknown kwargs: {extra_kwargs!r}") @@ -2455,10 +2454,10 @@ def list_fleet_products(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: @@ -2485,14 +2484,14 @@ def list_fleet_products(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'), @@ -2606,7 +2605,7 @@ def list_fleet_properties(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_fleet_properties got unknown kwargs: {extra_kwargs!r}") @@ -2615,10 +2614,10 @@ def list_fleet_properties(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 'lifecycle_state' in kwargs: @@ -2651,14 +2650,14 @@ def list_fleet_properties(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'), @@ -2776,7 +2775,7 @@ def list_fleet_resources(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_fleet_resources got unknown kwargs: {extra_kwargs!r}") @@ -2785,10 +2784,10 @@ def list_fleet_resources(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 'lifecycle_state' in kwargs: @@ -2822,14 +2821,14 @@ def list_fleet_resources(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'), @@ -2951,7 +2950,7 @@ def list_fleet_targets(self, fleet_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_fleet_targets got unknown kwargs: {extra_kwargs!r}") @@ -2960,10 +2959,10 @@ def list_fleet_targets(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: @@ -2998,14 +2997,14 @@ def list_fleet_targets(self, fleet_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'), @@ -3141,7 +3140,7 @@ def list_fleets(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_fleets got unknown kwargs: {extra_kwargs!r}") @@ -3188,14 +3187,14 @@ def list_fleets(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'), @@ -3334,7 +3333,7 @@ def list_inventory_resources(self, compartment_id, resource_compartment_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_inventory_resources got unknown kwargs: {extra_kwargs!r}") @@ -3368,14 +3367,14 @@ def list_inventory_resources(self, compartment_id, resource_compartment_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'), @@ -3482,7 +3481,7 @@ def list_targets(self, fleet_id, **kwargs): "opc_request_id", "is_confirmed_targets" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -3491,10 +3490,10 @@ def list_targets(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: @@ -3519,14 +3518,14 @@ def list_targets(self, fleet_id, **kwargs): "sortBy": kwargs.get("sort_by", missing), "isConfirmedTargets": kwargs.get("is_confirmed_targets", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3617,7 +3616,7 @@ def request_resource_validation(self, request_resource_validation_details, fleet "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_resource_validation got unknown kwargs: {extra_kwargs!r}") @@ -3626,10 +3625,10 @@ def request_resource_validation(self, request_resource_validation_details, fleet "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 = { @@ -3638,7 +3637,7 @@ def request_resource_validation(self, request_resource_validation_details, fleet "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3728,7 +3727,7 @@ def request_target_discovery(self, request_target_discovery_details, fleet_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"request_target_discovery got unknown kwargs: {extra_kwargs!r}") @@ -3737,10 +3736,10 @@ def request_target_discovery(self, request_target_discovery_details, fleet_id, * "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 = { @@ -3749,7 +3748,7 @@ def request_target_discovery(self, request_target_discovery_details, fleet_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'), @@ -3839,7 +3838,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}") @@ -3848,10 +3847,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 = { @@ -3860,7 +3859,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'), @@ -3954,7 +3953,7 @@ def update_fleet_credential(self, fleet_credential_id, fleet_id, update_fleet_cr "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_credential got unknown kwargs: {extra_kwargs!r}") @@ -3964,10 +3963,10 @@ def update_fleet_credential(self, fleet_credential_id, fleet_id, update_fleet_cr "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 = { @@ -3976,7 +3975,7 @@ def update_fleet_credential(self, fleet_credential_id, fleet_id, update_fleet_cr "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 update_fleet_property(self, fleet_property_id, fleet_id, update_fleet_proper "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_property got unknown kwargs: {extra_kwargs!r}") @@ -4078,10 +4077,10 @@ def update_fleet_property(self, fleet_property_id, fleet_id, update_fleet_proper "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 = { @@ -4090,7 +4089,7 @@ def update_fleet_property(self, fleet_property_id, fleet_id, update_fleet_proper "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4184,7 +4183,7 @@ def update_fleet_resource(self, fleet_resource_id, fleet_id, update_fleet_resour "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_resource got unknown kwargs: {extra_kwargs!r}") @@ -4194,10 +4193,10 @@ def update_fleet_resource(self, fleet_resource_id, fleet_id, update_fleet_resour "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 = { @@ -4206,7 +4205,7 @@ def update_fleet_resource(self, fleet_resource_id, fleet_id, update_fleet_resour "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_apps_management/fleet_apps_management_maintenance_window_client.py b/src/oci/fleet_apps_management/fleet_apps_management_maintenance_window_client.py index a326d38555..cab457dbe3 100644 --- a/src/oci/fleet_apps_management/fleet_apps_management_maintenance_window_client.py +++ b/src/oci/fleet_apps_management/fleet_apps_management_maintenance_window_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_maintenance_window(self, create_maintenance_window_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_maintenance_window got unknown kwargs: {extra_kwargs!r}") @@ -179,7 +178,7 @@ def create_maintenance_window(self, create_maintenance_window_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_maintenance_window(self, maintenance_window_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_maintenance_window got unknown kwargs: {extra_kwargs!r}") @@ -275,10 +274,10 @@ def delete_maintenance_window(self, maintenance_window_id, **kwargs): "maintenanceWindowId": maintenance_window_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_maintenance_window(self, maintenance_window_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_maintenance_window(self, maintenance_window_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_window got unknown kwargs: {extra_kwargs!r}") @@ -372,10 +371,10 @@ def get_maintenance_window(self, maintenance_window_id, **kwargs): "maintenanceWindowId": maintenance_window_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_maintenance_window(self, maintenance_window_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -503,7 +502,7 @@ def list_maintenance_windows(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_maintenance_windows got unknown kwargs: {extra_kwargs!r}") @@ -540,14 +539,14 @@ def list_maintenance_windows(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'), @@ -636,7 +635,7 @@ def update_maintenance_window(self, maintenance_window_id, update_maintenance_wi "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_window got unknown kwargs: {extra_kwargs!r}") @@ -645,10 +644,10 @@ def update_maintenance_window(self, maintenance_window_id, update_maintenance_wi "maintenanceWindowId": maintenance_window_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 update_maintenance_window(self, maintenance_window_id, update_maintenance_wi "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_apps_management/fleet_apps_management_operations_client.py b/src/oci/fleet_apps_management/fleet_apps_management_operations_client.py index d6239e0a0c..7e8106434c 100644 --- a/src/oci/fleet_apps_management/fleet_apps_management_operations_client.py +++ b/src/oci/fleet_apps_management/fleet_apps_management_operations_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_patch_compartment(self, patch_id, change_patch_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_patch_compartment got unknown kwargs: {extra_kwargs!r}") @@ -191,10 +190,10 @@ def change_patch_compartment(self, patch_id, change_patch_compartment_details, * "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 = { @@ -204,7 +203,7 @@ def change_patch_compartment(self, patch_id, change_patch_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_patch(self, create_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_patch got unknown kwargs: {extra_kwargs!r}") @@ -302,7 +301,7 @@ def create_patch(self, create_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'), @@ -389,7 +388,7 @@ def create_scheduler_definition(self, create_scheduler_definition_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_scheduler_definition got unknown kwargs: {extra_kwargs!r}") @@ -400,7 +399,7 @@ def create_scheduler_definition(self, create_scheduler_definition_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'), @@ -487,7 +486,7 @@ def delete_patch(self, patch_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -496,10 +495,10 @@ def delete_patch(self, 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 = { @@ -508,7 +507,7 @@ def delete_patch(self, patch_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -592,7 +591,7 @@ def delete_scheduler_definition(self, scheduler_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_scheduler_definition got unknown kwargs: {extra_kwargs!r}") @@ -601,10 +600,10 @@ def delete_scheduler_definition(self, scheduler_definition_id, **kwargs): "schedulerDefinitionId": scheduler_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 = { @@ -613,7 +612,7 @@ def delete_scheduler_definition(self, scheduler_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'), @@ -697,7 +696,7 @@ def delete_scheduler_job(self, scheduler_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_scheduler_job got unknown kwargs: {extra_kwargs!r}") @@ -706,10 +705,10 @@ def delete_scheduler_job(self, scheduler_job_id, **kwargs): "schedulerJobId": scheduler_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 = { @@ -718,7 +717,7 @@ def delete_scheduler_job(self, scheduler_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'), @@ -810,7 +809,7 @@ def export_compliance_report(self, export_compliance_report_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"export_compliance_report got unknown kwargs: {extra_kwargs!r}") @@ -822,7 +821,7 @@ def export_compliance_report(self, export_compliance_report_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'), @@ -910,7 +909,7 @@ def get_execution(self, scheduler_job_id, job_activity_id, resource_id, executio "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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 got unknown kwargs: {extra_kwargs!r}") @@ -922,10 +921,10 @@ def get_execution(self, scheduler_job_id, job_activity_id, resource_id, executio "executionId": 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 = { @@ -933,7 +932,7 @@ def get_execution(self, scheduler_job_id, job_activity_id, resource_id, executio "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_job_activity(self, scheduler_job_id, job_activity_id, **kwargs): "is_details_required", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_activity got unknown kwargs: {extra_kwargs!r}") @@ -1028,23 +1027,23 @@ def get_job_activity(self, scheduler_job_id, job_activity_id, **kwargs): "jobActivityId": job_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') query_params = { "isDetailsRequired": kwargs.get("is_details_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", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 get_patch(self, 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_patch got unknown kwargs: {extra_kwargs!r}") @@ -1133,10 +1132,10 @@ def get_patch(self, 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 = { @@ -1144,7 +1143,7 @@ def get_patch(self, 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'), @@ -1222,7 +1221,7 @@ def get_scheduler_definition(self, scheduler_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_scheduler_definition got unknown kwargs: {extra_kwargs!r}") @@ -1231,10 +1230,10 @@ def get_scheduler_definition(self, scheduler_definition_id, **kwargs): "schedulerDefinitionId": scheduler_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 = { @@ -1242,7 +1241,7 @@ def get_scheduler_definition(self, scheduler_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'), @@ -1320,7 +1319,7 @@ def get_scheduler_job(self, scheduler_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_scheduler_job got unknown kwargs: {extra_kwargs!r}") @@ -1329,10 +1328,10 @@ def get_scheduler_job(self, scheduler_job_id, **kwargs): "schedulerJobId": scheduler_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 = { @@ -1340,7 +1339,7 @@ def get_scheduler_job(self, scheduler_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'), @@ -1467,7 +1466,7 @@ def list_compliance_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_compliance_records got unknown kwargs: {extra_kwargs!r}") @@ -1500,14 +1499,14 @@ def list_compliance_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'), @@ -1627,7 +1626,7 @@ def list_executions(self, scheduler_job_id, job_activity_id, resource_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_executions got unknown kwargs: {extra_kwargs!r}") @@ -1638,10 +1637,10 @@ def list_executions(self, scheduler_job_id, job_activity_id, resource_id, **kwar "resourceId": 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_order' in kwargs: @@ -1668,14 +1667,14 @@ def list_executions(self, scheduler_job_id, job_activity_id, resource_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'), @@ -1798,7 +1797,7 @@ def list_installed_patches(self, compartment_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_installed_patches got unknown kwargs: {extra_kwargs!r}") @@ -1836,14 +1835,14 @@ def list_installed_patches(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'), @@ -1958,7 +1957,7 @@ def list_inventory_records(self, compartment_id, **kwargs): "is_details_required", "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_inventory_records got unknown kwargs: {extra_kwargs!r}") @@ -1988,14 +1987,14 @@ def list_inventory_records(self, compartment_id, **kwargs): "isDetailsRequired": kwargs.get("is_details_required", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 list_patches(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_patches got unknown kwargs: {extra_kwargs!r}") @@ -2191,14 +2190,14 @@ def list_patches(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'), @@ -2324,7 +2323,7 @@ def list_recommended_patches(self, compartment_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_recommended_patches got unknown kwargs: {extra_kwargs!r}") @@ -2370,14 +2369,14 @@ def list_recommended_patches(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'), @@ -2479,7 +2478,7 @@ def list_report_metadata(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_report_metadata got unknown kwargs: {extra_kwargs!r}") @@ -2506,14 +2505,14 @@ def list_report_metadata(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'), @@ -2630,7 +2629,7 @@ def list_resources(self, scheduler_job_id, job_activity_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_resources got unknown kwargs: {extra_kwargs!r}") @@ -2640,10 +2639,10 @@ def list_resources(self, scheduler_job_id, job_activity_id, **kwargs): "jobActivityId": job_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') if 'sort_order' in kwargs: @@ -2670,14 +2669,14 @@ def list_resources(self, scheduler_job_id, job_activity_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2781,7 +2780,7 @@ def list_scheduled_fleets(self, scheduler_definition_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_fleets got unknown kwargs: {extra_kwargs!r}") @@ -2790,10 +2789,10 @@ def list_scheduled_fleets(self, scheduler_definition_id, **kwargs): "schedulerDefinitionId": scheduler_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') if 'sort_order' in kwargs: @@ -2817,14 +2816,14 @@ def list_scheduled_fleets(self, scheduler_definition_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 list_scheduler_definitions(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_scheduler_definitions got unknown kwargs: {extra_kwargs!r}") @@ -3013,14 +3012,14 @@ def list_scheduler_definitions(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'), @@ -3165,7 +3164,7 @@ def list_scheduler_executions(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_scheduler_executions got unknown kwargs: {extra_kwargs!r}") @@ -3202,14 +3201,14 @@ def list_scheduler_executions(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'), @@ -3354,7 +3353,7 @@ def list_scheduler_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_scheduler_jobs got unknown kwargs: {extra_kwargs!r}") @@ -3397,14 +3396,14 @@ def list_scheduler_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'), @@ -3521,7 +3520,7 @@ def list_steps(self, scheduler_job_id, job_activity_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_steps got unknown kwargs: {extra_kwargs!r}") @@ -3531,10 +3530,10 @@ def list_steps(self, scheduler_job_id, job_activity_id, **kwargs): "jobActivityId": job_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') if 'sort_order' in kwargs: @@ -3561,14 +3560,14 @@ def list_steps(self, scheduler_job_id, job_activity_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3686,7 +3685,7 @@ def list_target_components(self, compartment_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_target_components got unknown kwargs: {extra_kwargs!r}") @@ -3723,14 +3722,14 @@ def list_target_components(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'), @@ -3842,7 +3841,7 @@ def list_target_properties(self, compartment_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_target_properties got unknown kwargs: {extra_kwargs!r}") @@ -3878,14 +3877,14 @@ def list_target_properties(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'), @@ -3982,7 +3981,7 @@ def manage_job_execution(self, manage_job_execution_details, scheduler_job_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"manage_job_execution got unknown kwargs: {extra_kwargs!r}") @@ -3991,10 +3990,10 @@ def manage_job_execution(self, manage_job_execution_details, scheduler_job_id, * "schedulerJobId": scheduler_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 = { @@ -4004,7 +4003,7 @@ def manage_job_execution(self, manage_job_execution_details, scheduler_job_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'), @@ -4115,7 +4114,7 @@ def report(self, report_details, compartment_id, **kwargs): "page", "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"report got unknown kwargs: {extra_kwargs!r}") @@ -4126,7 +4125,7 @@ def report(self, report_details, compartment_id, **kwargs): "page": kwargs.get("page", 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", @@ -4135,7 +4134,7 @@ def report(self, report_details, 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'), @@ -4237,7 +4236,7 @@ def summarize_compliance_record_counts(self, **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"summarize_compliance_record_counts got unknown kwargs: {extra_kwargs!r}") @@ -4256,14 +4255,14 @@ def summarize_compliance_record_counts(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'), @@ -4362,7 +4361,7 @@ def summarize_managed_entity_counts(self, **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"summarize_managed_entity_counts got unknown kwargs: {extra_kwargs!r}") @@ -4381,14 +4380,14 @@ def summarize_managed_entity_counts(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'), @@ -4487,7 +4486,7 @@ def summarize_scheduler_job_counts(self, **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"summarize_scheduler_job_counts got unknown kwargs: {extra_kwargs!r}") @@ -4506,14 +4505,14 @@ def summarize_scheduler_job_counts(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'), @@ -4602,7 +4601,7 @@ def update_patch(self, patch_id, update_patch_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_patch got unknown kwargs: {extra_kwargs!r}") @@ -4611,10 +4610,10 @@ def update_patch(self, patch_id, update_patch_details, **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 = { @@ -4623,7 +4622,7 @@ def update_patch(self, patch_id, update_patch_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'), @@ -4712,7 +4711,7 @@ def update_scheduler_definition(self, scheduler_definition_id, update_scheduler_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_scheduler_definition got unknown kwargs: {extra_kwargs!r}") @@ -4721,10 +4720,10 @@ def update_scheduler_definition(self, scheduler_definition_id, update_scheduler_ "schedulerDefinitionId": scheduler_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 = { @@ -4733,7 +4732,7 @@ def update_scheduler_definition(self, scheduler_definition_id, update_scheduler_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4822,7 +4821,7 @@ def update_scheduler_job(self, scheduler_job_id, update_scheduler_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_scheduler_job got unknown kwargs: {extra_kwargs!r}") @@ -4831,10 +4830,10 @@ def update_scheduler_job(self, scheduler_job_id, update_scheduler_job_details, * "schedulerJobId": scheduler_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 = { @@ -4843,7 +4842,7 @@ def update_scheduler_job(self, scheduler_job_id, update_scheduler_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/fleet_apps_management/fleet_apps_management_provision_client.py b/src/oci/fleet_apps_management/fleet_apps_management_provision_client.py index 2f11e0bcbf..2028f929f8 100644 --- a/src/oci/fleet_apps_management/fleet_apps_management_provision_client.py +++ b/src/oci/fleet_apps_management/fleet_apps_management_provision_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_provision_compartment(self, provision_id, change_provision_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_provision_compartment got unknown kwargs: {extra_kwargs!r}") @@ -185,10 +184,10 @@ def change_provision_compartment(self, provision_id, change_provision_compartmen "provisionId": provision_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_provision_compartment(self, provision_id, change_provision_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'), @@ -283,7 +282,7 @@ def create_provision(self, create_provision_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_provision got unknown kwargs: {extra_kwargs!r}") @@ -294,7 +293,7 @@ def create_provision(self, create_provision_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_provision(self, provision_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_provision got unknown kwargs: {extra_kwargs!r}") @@ -392,10 +391,10 @@ def delete_provision(self, provision_id, **kwargs): "provisionId": provision_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_provision(self, provision_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -482,7 +481,7 @@ def get_provision(self, provision_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_provision got unknown kwargs: {extra_kwargs!r}") @@ -491,10 +490,10 @@ def get_provision(self, provision_id, **kwargs): "provisionId": provision_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 get_provision(self, provision_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 list_provisions(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_provisions got unknown kwargs: {extra_kwargs!r}") @@ -660,14 +659,14 @@ def list_provisions(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'), @@ -758,7 +757,7 @@ def update_provision(self, provision_id, update_provision_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_provision got unknown kwargs: {extra_kwargs!r}") @@ -767,10 +766,10 @@ def update_provision(self, provision_id, update_provision_details, **kwargs): "provisionId": provision_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -779,7 +778,7 @@ def update_provision(self, provision_id, update_provision_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/fleet_apps_management/fleet_apps_management_runbooks_client.py b/src/oci/fleet_apps_management/fleet_apps_management_runbooks_client.py index 2f80c03bfd..72e7d32435 100644 --- a/src/oci/fleet_apps_management/fleet_apps_management_runbooks_client.py +++ b/src/oci/fleet_apps_management/fleet_apps_management_runbooks_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_runbook_compartment(self, runbook_id, change_runbook_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_runbook_compartment got unknown kwargs: {extra_kwargs!r}") @@ -191,10 +190,10 @@ def change_runbook_compartment(self, runbook_id, change_runbook_compartment_deta "runbookId": runbook_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_runbook_compartment(self, runbook_id, change_runbook_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'), @@ -305,7 +304,7 @@ def change_task_record_compartment(self, task_record_id, change_task_record_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_task_record_compartment got unknown kwargs: {extra_kwargs!r}") @@ -314,10 +313,10 @@ def change_task_record_compartment(self, task_record_id, change_task_record_comp "taskRecordId": task_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 = { @@ -327,7 +326,7 @@ def change_task_record_compartment(self, task_record_id, change_task_record_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'), @@ -414,7 +413,7 @@ def create_runbook(self, create_runbook_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_runbook got unknown kwargs: {extra_kwargs!r}") @@ -425,7 +424,7 @@ def create_runbook(self, create_runbook_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_runbook_version(self, create_runbook_version_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_runbook_version got unknown kwargs: {extra_kwargs!r}") @@ -523,7 +522,7 @@ def create_runbook_version(self, create_runbook_version_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'), @@ -610,7 +609,7 @@ def create_task_record(self, create_task_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_task_record got unknown kwargs: {extra_kwargs!r}") @@ -621,7 +620,7 @@ def create_task_record(self, create_task_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'), @@ -708,7 +707,7 @@ def delete_runbook(self, runbook_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_runbook got unknown kwargs: {extra_kwargs!r}") @@ -717,10 +716,10 @@ def delete_runbook(self, runbook_id, **kwargs): "runbookId": runbook_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 delete_runbook(self, runbook_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -813,7 +812,7 @@ def delete_runbook_version(self, runbook_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_runbook_version got unknown kwargs: {extra_kwargs!r}") @@ -822,10 +821,10 @@ def delete_runbook_version(self, runbook_version_id, **kwargs): "runbookVersionId": runbook_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 = { @@ -834,7 +833,7 @@ def delete_runbook_version(self, runbook_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'), @@ -918,7 +917,7 @@ def delete_task_record(self, task_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_task_record got unknown kwargs: {extra_kwargs!r}") @@ -927,10 +926,10 @@ def delete_task_record(self, task_record_id, **kwargs): "taskRecordId": task_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 = { @@ -939,7 +938,7 @@ def delete_task_record(self, task_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'), @@ -1034,7 +1033,7 @@ def export_runbook(self, export_runbook_details, runbook_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_runbook got unknown kwargs: {extra_kwargs!r}") @@ -1043,10 +1042,10 @@ def export_runbook(self, export_runbook_details, runbook_id, **kwargs): "runbookId": runbook_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 export_runbook(self, export_runbook_details, runbook_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1154,7 +1153,7 @@ def export_runbook_version(self, export_runbook_version_details, runbook_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"export_runbook_version got unknown kwargs: {extra_kwargs!r}") @@ -1163,10 +1162,10 @@ def export_runbook_version(self, export_runbook_version_details, runbook_version "runbookVersionId": runbook_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 = { @@ -1176,7 +1175,7 @@ def export_runbook_version(self, export_runbook_version_details, runbook_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'), @@ -1263,7 +1262,7 @@ def find_runbook_export_dependency(self, find_runbook_export_dependency_details, "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"find_runbook_export_dependency got unknown kwargs: {extra_kwargs!r}") @@ -1272,14 +1271,14 @@ def find_runbook_export_dependency(self, find_runbook_export_dependency_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'), @@ -1367,7 +1366,7 @@ def find_runbook_import_dependency(self, find_runbook_import_dependency_details, "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"find_runbook_import_dependency got unknown kwargs: {extra_kwargs!r}") @@ -1376,14 +1375,14 @@ def find_runbook_import_dependency(self, find_runbook_import_dependency_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'), @@ -1463,7 +1462,7 @@ def get_runbook(self, runbook_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_runbook got unknown kwargs: {extra_kwargs!r}") @@ -1472,10 +1471,10 @@ def get_runbook(self, runbook_id, **kwargs): "runbookId": runbook_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1483,7 +1482,7 @@ def get_runbook(self, runbook_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_runbook_export(self, runbook_id, 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_runbook_export got unknown kwargs: {extra_kwargs!r}") @@ -1574,10 +1573,10 @@ def get_runbook_export(self, runbook_id, 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 = { @@ -1585,7 +1584,7 @@ def get_runbook_export(self, runbook_id, 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'), @@ -1666,7 +1665,7 @@ def get_runbook_import(self, runbook_id, import_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_runbook_import got unknown kwargs: {extra_kwargs!r}") @@ -1676,10 +1675,10 @@ def get_runbook_import(self, runbook_id, import_id, **kwargs): "importId": import_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1687,7 +1686,7 @@ def get_runbook_import(self, runbook_id, import_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 get_runbook_version(self, runbook_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_runbook_version got unknown kwargs: {extra_kwargs!r}") @@ -1774,10 +1773,10 @@ def get_runbook_version(self, runbook_version_id, **kwargs): "runbookVersionId": runbook_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 = { @@ -1785,7 +1784,7 @@ def get_runbook_version(self, runbook_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'), @@ -1863,7 +1862,7 @@ def get_task_record(self, task_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_task_record got unknown kwargs: {extra_kwargs!r}") @@ -1872,10 +1871,10 @@ def get_task_record(self, task_record_id, **kwargs): "taskRecordId": task_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 = { @@ -1883,7 +1882,7 @@ def get_task_record(self, task_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'), @@ -1977,7 +1976,7 @@ def import_runbook(self, import_runbook_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"import_runbook got unknown kwargs: {extra_kwargs!r}") @@ -1989,7 +1988,7 @@ def import_runbook(self, import_runbook_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'), @@ -2082,7 +2081,7 @@ def import_runbook_precheck(self, import_runbook_precheck_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"import_runbook_precheck got unknown kwargs: {extra_kwargs!r}") @@ -2094,7 +2093,7 @@ def import_runbook_precheck(self, import_runbook_precheck_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'), @@ -2187,7 +2186,7 @@ def import_runbook_version(self, import_runbook_version_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"import_runbook_version got unknown kwargs: {extra_kwargs!r}") @@ -2199,7 +2198,7 @@ def import_runbook_version(self, import_runbook_version_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'), @@ -2302,7 +2301,7 @@ def list_runbook_export_statuses(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_runbook_export_statuses got unknown kwargs: {extra_kwargs!r}") @@ -2329,14 +2328,14 @@ def list_runbook_export_statuses(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'), @@ -2440,7 +2439,7 @@ def list_runbook_import_statuses(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_runbook_import_statuses got unknown kwargs: {extra_kwargs!r}") @@ -2467,14 +2466,14 @@ def list_runbook_import_statuses(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'), @@ -2592,7 +2591,7 @@ def list_runbook_versions(self, **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_runbook_versions got unknown kwargs: {extra_kwargs!r}") @@ -2629,14 +2628,14 @@ def list_runbook_versions(self, **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'), @@ -2766,7 +2765,7 @@ def list_runbooks(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_runbooks got unknown kwargs: {extra_kwargs!r}") @@ -2812,14 +2811,14 @@ def list_runbooks(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'), @@ -2949,7 +2948,7 @@ def list_task_records(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_task_records got unknown kwargs: {extra_kwargs!r}") @@ -2995,14 +2994,14 @@ def list_task_records(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'), @@ -3097,7 +3096,7 @@ def publish_runbook(self, publish_runbook_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"publish_runbook got unknown kwargs: {extra_kwargs!r}") @@ -3109,7 +3108,7 @@ def publish_runbook(self, publish_runbook_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'), @@ -3202,7 +3201,7 @@ def set_default_runbook(self, set_default_runbook_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"set_default_runbook got unknown kwargs: {extra_kwargs!r}") @@ -3214,7 +3213,7 @@ def set_default_runbook(self, set_default_runbook_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'), @@ -3304,7 +3303,7 @@ def update_runbook(self, runbook_id, update_runbook_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_runbook got unknown kwargs: {extra_kwargs!r}") @@ -3313,10 +3312,10 @@ def update_runbook(self, runbook_id, update_runbook_details, **kwargs): "runbookId": runbook_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3325,7 +3324,7 @@ def update_runbook(self, runbook_id, update_runbook_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'), @@ -3414,7 +3413,7 @@ def update_runbook_version(self, runbook_version_id, update_runbook_version_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_runbook_version got unknown kwargs: {extra_kwargs!r}") @@ -3423,10 +3422,10 @@ def update_runbook_version(self, runbook_version_id, update_runbook_version_deta "runbookVersionId": runbook_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 = { @@ -3435,7 +3434,7 @@ def update_runbook_version(self, runbook_version_id, update_runbook_version_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'), @@ -3524,7 +3523,7 @@ def update_task_record(self, task_record_id, update_task_record_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_task_record got unknown kwargs: {extra_kwargs!r}") @@ -3533,10 +3532,10 @@ def update_task_record(self, task_record_id, update_task_record_details, **kwarg "taskRecordId": task_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 = { @@ -3545,7 +3544,7 @@ def update_task_record(self, task_record_id, update_task_record_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/fleet_apps_management/fleet_apps_management_work_request_client.py b/src/oci/fleet_apps_management/fleet_apps_management_work_request_client.py index 047ccea332..80b5213b82 100644 --- a/src/oci/fleet_apps_management/fleet_apps_management_work_request_client.py +++ b/src/oci/fleet_apps_management/fleet_apps_management_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 @@ -160,7 +159,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}") @@ -169,10 +168,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 = { @@ -180,7 +179,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'), @@ -278,7 +277,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}") @@ -287,10 +286,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: @@ -313,14 +312,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'), @@ -420,7 +419,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}") @@ -429,10 +428,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: @@ -455,14 +454,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'), @@ -578,7 +577,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}") @@ -614,14 +613,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/fleet_software_update/fleet_software_update_client.py b/src/oci/fleet_software_update/fleet_software_update_client.py index 272de266a8..db5c88edb3 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 @@ -177,7 +176,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}") @@ -186,10 +185,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 = { @@ -199,7 +198,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'), @@ -298,7 +297,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}") @@ -307,10 +306,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 = { @@ -320,7 +319,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'), @@ -415,7 +414,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}") @@ -424,10 +423,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 = { @@ -437,7 +436,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'), @@ -534,7 +533,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}") @@ -543,10 +542,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 = { @@ -556,7 +555,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'), @@ -655,7 +654,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}") @@ -664,10 +663,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 = { @@ -677,7 +676,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'), @@ -776,7 +775,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}") @@ -785,10 +784,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 = { @@ -798,7 +797,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'), @@ -897,7 +896,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}") @@ -906,10 +905,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 = { @@ -919,7 +918,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'), @@ -1009,7 +1008,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}") @@ -1018,10 +1017,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 = { @@ -1030,7 +1029,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'), @@ -1119,7 +1118,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}") @@ -1130,7 +1129,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'), @@ -1217,7 +1216,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}") @@ -1228,7 +1227,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'), @@ -1316,7 +1315,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}") @@ -1327,7 +1326,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'), @@ -1414,7 +1413,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}") @@ -1425,7 +1424,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'), @@ -1512,7 +1511,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}") @@ -1521,10 +1520,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 = { @@ -1533,7 +1532,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'), @@ -1617,7 +1616,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}") @@ -1626,10 +1625,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 = { @@ -1638,7 +1637,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'), @@ -1727,7 +1726,7 @@ def delete_fsu_collection_target(self, fsu_collection_id, 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_fsu_collection_target got unknown kwargs: {extra_kwargs!r}") @@ -1737,10 +1736,10 @@ def delete_fsu_collection_target(self, fsu_collection_id, 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 = { @@ -1749,7 +1748,7 @@ def delete_fsu_collection_target(self, fsu_collection_id, 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'), @@ -1833,7 +1832,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}") @@ -1842,10 +1841,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 = { @@ -1854,7 +1853,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'), @@ -1938,7 +1937,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}") @@ -1947,10 +1946,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 = { @@ -1959,7 +1958,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'), @@ -2043,7 +2042,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}") @@ -2052,10 +2051,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 = { @@ -2064,7 +2063,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'), @@ -2140,7 +2139,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}") @@ -2149,10 +2148,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 = { @@ -2160,7 +2159,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'), @@ -2239,7 +2238,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}") @@ -2248,10 +2247,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 = { @@ -2259,7 +2258,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'), @@ -2337,7 +2336,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}") @@ -2346,10 +2345,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 = { @@ -2357,7 +2356,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'), @@ -2438,7 +2437,7 @@ def get_fsu_collection_target(self, fsu_collection_id, 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_fsu_collection_target got unknown kwargs: {extra_kwargs!r}") @@ -2448,10 +2447,10 @@ def get_fsu_collection_target(self, fsu_collection_id, 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 = { @@ -2459,7 +2458,7 @@ def get_fsu_collection_target(self, fsu_collection_id, 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'), @@ -2537,7 +2536,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}") @@ -2546,10 +2545,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 = { @@ -2557,7 +2556,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'), @@ -2635,7 +2634,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}") @@ -2644,10 +2643,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 = { @@ -2655,7 +2654,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'), @@ -2733,7 +2732,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}") @@ -2742,10 +2741,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 = { @@ -2753,7 +2752,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'), @@ -2831,7 +2830,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}") @@ -2840,10 +2839,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 = { @@ -2851,7 +2850,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'), @@ -2929,7 +2928,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}") @@ -2938,10 +2937,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 = { @@ -2949,7 +2948,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'), @@ -3068,7 +3067,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}") @@ -3112,14 +3111,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'), @@ -3232,7 +3231,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}") @@ -3241,10 +3240,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: @@ -3277,14 +3276,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'), @@ -3401,7 +3400,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}") @@ -3444,14 +3443,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'), @@ -3574,7 +3573,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}") @@ -3619,14 +3618,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'), @@ -3735,7 +3734,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}") @@ -3770,14 +3769,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'), @@ -3890,7 +3889,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}") @@ -3899,10 +3898,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: @@ -3935,14 +3934,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'), @@ -4031,7 +4030,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}") @@ -4040,24 +4039,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'), @@ -4168,7 +4167,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}") @@ -4203,14 +4202,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'), @@ -4309,7 +4308,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}") @@ -4318,10 +4317,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: @@ -4344,14 +4343,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'), @@ -4452,7 +4451,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}") @@ -4461,10 +4460,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: @@ -4487,14 +4486,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'), @@ -4609,7 +4608,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}") @@ -4645,14 +4644,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'), @@ -4751,7 +4750,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}") @@ -4760,10 +4759,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 = { @@ -4773,7 +4772,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'), @@ -4868,7 +4867,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}") @@ -4877,10 +4876,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 = { @@ -4890,7 +4889,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'), @@ -4984,7 +4983,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}") @@ -4993,10 +4992,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 = { @@ -5006,7 +5005,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'), @@ -5094,7 +5093,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}") @@ -5103,10 +5102,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 = { @@ -5115,7 +5114,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'), @@ -5204,7 +5203,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}") @@ -5213,10 +5212,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 = { @@ -5225,7 +5224,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'), @@ -5314,7 +5313,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}") @@ -5323,10 +5322,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 = { @@ -5335,7 +5334,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'), @@ -5424,7 +5423,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}") @@ -5433,10 +5432,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 = { @@ -5445,7 +5444,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'), @@ -5534,7 +5533,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}") @@ -5543,10 +5542,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 = { @@ -5555,7 +5554,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 00e61b9d53..3a43f384a8 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 @@ -194,7 +193,7 @@ def invoke_function(self, function_id, **kwargs): "opc_request_id", "is_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"invoke_function got unknown kwargs: {extra_kwargs!r}") @@ -203,10 +202,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 = { @@ -216,7 +215,7 @@ def invoke_function(self, function_id, **kwargs): "opc-request-id": kwargs.get("opc_request_id", missing), "is-dry-run": kwargs.get("is_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} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -225,7 +224,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 ca0005fb5a..a00555f0ef 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 @@ -175,7 +174,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}") @@ -184,10 +183,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 = { @@ -196,7 +195,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'), @@ -275,7 +274,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}") @@ -285,7 +284,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'), @@ -364,7 +363,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}") @@ -374,7 +373,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'), @@ -461,7 +460,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}") @@ -470,10 +469,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 = { @@ -482,7 +481,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'), @@ -567,7 +566,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}") @@ -576,10 +575,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 = { @@ -588,7 +587,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'), @@ -667,7 +666,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}") @@ -676,10 +675,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 = { @@ -687,7 +686,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'), @@ -768,7 +767,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}") @@ -777,10 +776,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 = { @@ -788,7 +787,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'), @@ -867,7 +866,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}") @@ -876,10 +875,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 = { @@ -887,7 +886,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'), @@ -966,7 +965,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}") @@ -975,10 +974,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 = { @@ -986,7 +985,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'), @@ -1113,7 +1112,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}") @@ -1149,14 +1148,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'), @@ -1283,7 +1282,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}") @@ -1319,14 +1318,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'), @@ -1454,7 +1453,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}") @@ -1491,14 +1490,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'), @@ -1626,7 +1625,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}") @@ -1664,14 +1663,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'), @@ -1770,7 +1769,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}") @@ -1788,14 +1787,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'), @@ -1885,7 +1884,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}") @@ -1894,10 +1893,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 = { @@ -1906,7 +1905,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'), @@ -1998,7 +1997,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}") @@ -2007,10 +2006,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 = { @@ -2019,7 +2018,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/fusion_applications_client.py b/src/oci/fusion_apps/fusion_applications_client.py index f22103b502..7b3595f073 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 @@ -180,7 +179,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}") @@ -189,10 +188,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 = { @@ -202,7 +201,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'), @@ -301,7 +300,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}") @@ -310,10 +309,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 = { @@ -323,7 +322,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'), @@ -413,7 +412,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}") @@ -422,10 +421,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 = { @@ -434,7 +433,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'), @@ -521,7 +520,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}") @@ -532,7 +531,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'), @@ -620,7 +619,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}") @@ -629,10 +628,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 = { @@ -641,7 +640,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'), @@ -728,7 +727,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}") @@ -739,7 +738,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'), @@ -827,7 +826,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}") @@ -836,10 +835,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 = { @@ -848,7 +847,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'), @@ -938,7 +937,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}") @@ -947,10 +946,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 = { @@ -959,7 +958,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'), @@ -1046,7 +1045,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}") @@ -1055,10 +1054,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 = { @@ -1067,7 +1066,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'), @@ -1154,7 +1153,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}") @@ -1164,10 +1163,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 = { @@ -1176,7 +1175,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'), @@ -1260,7 +1259,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}") @@ -1269,10 +1268,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 = { @@ -1281,7 +1280,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'), @@ -1368,7 +1367,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}") @@ -1378,10 +1377,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 = { @@ -1390,7 +1389,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'), @@ -1477,7 +1476,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}") @@ -1487,10 +1486,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 = { @@ -1499,7 +1498,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'), @@ -1575,7 +1574,7 @@ def generate_extract_details(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"generate_extract_details got unknown kwargs: {extra_kwargs!r}") @@ -1584,10 +1583,10 @@ def generate_extract_details(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 = { @@ -1595,7 +1594,7 @@ def generate_extract_details(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'), @@ -1676,7 +1675,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}") @@ -1686,10 +1685,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 = { @@ -1697,7 +1696,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'), @@ -1775,7 +1774,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}") @@ -1784,10 +1783,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 = { @@ -1795,7 +1794,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'), @@ -1873,7 +1872,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}") @@ -1882,10 +1881,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 = { @@ -1893,7 +1892,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'), @@ -1971,7 +1970,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}") @@ -1980,10 +1979,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 = { @@ -1991,7 +1990,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'), @@ -2069,7 +2068,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}") @@ -2078,10 +2077,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 = { @@ -2089,7 +2088,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'), @@ -2167,7 +2166,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}") @@ -2176,10 +2175,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 = { @@ -2187,7 +2186,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'), @@ -2268,7 +2267,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}") @@ -2278,10 +2277,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 = { @@ -2289,7 +2288,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'), @@ -2370,7 +2369,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}") @@ -2380,10 +2379,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 = { @@ -2391,7 +2390,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'), @@ -2472,7 +2471,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}") @@ -2482,10 +2481,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 = { @@ -2493,7 +2492,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'), @@ -2571,7 +2570,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}") @@ -2580,10 +2579,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 = { @@ -2591,7 +2590,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'), @@ -2669,7 +2668,7 @@ def initiate_extract(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"initiate_extract got unknown kwargs: {extra_kwargs!r}") @@ -2678,10 +2677,10 @@ def initiate_extract(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 = { @@ -2689,7 +2688,7 @@ def initiate_extract(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'), @@ -2765,7 +2764,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}") @@ -2774,10 +2773,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 = { @@ -2785,7 +2784,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'), @@ -2889,7 +2888,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}") @@ -2898,10 +2897,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: @@ -2932,14 +2931,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'), @@ -3053,7 +3052,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}") @@ -3089,14 +3088,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'), @@ -3208,7 +3207,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}") @@ -3244,14 +3243,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'), @@ -3367,7 +3366,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}") @@ -3376,10 +3375,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: @@ -3413,14 +3412,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'), @@ -3554,7 +3553,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}") @@ -3563,10 +3562,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: @@ -3617,14 +3616,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'), @@ -3740,7 +3739,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}") @@ -3749,10 +3748,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: @@ -3792,14 +3791,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'), @@ -3899,7 +3898,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}") @@ -3908,10 +3907,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: @@ -3934,14 +3933,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'), @@ -4041,7 +4040,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}") @@ -4050,10 +4049,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: @@ -4076,14 +4075,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'), @@ -4183,7 +4182,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}") @@ -4192,10 +4191,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: @@ -4218,14 +4217,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'), @@ -4335,7 +4334,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}") @@ -4370,14 +4369,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'), @@ -4477,7 +4476,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}") @@ -4487,10 +4486,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 = { @@ -4500,7 +4499,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'), @@ -4590,7 +4589,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}") @@ -4599,10 +4598,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 = { @@ -4611,7 +4610,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'), @@ -4700,7 +4699,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}") @@ -4709,10 +4708,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 = { @@ -4721,7 +4720,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'), @@ -4813,7 +4812,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}") @@ -4823,10 +4822,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 = { @@ -4835,7 +4834,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'), @@ -4918,7 +4917,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}") @@ -4927,10 +4926,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 = { @@ -4938,7 +4937,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/generative_ai/generative_ai_client.py b/src/oci/generative_ai/generative_ai_client.py index 56f4b5e626..9292450cd2 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 @@ -191,7 +190,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}") @@ -200,10 +199,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 = { @@ -213,7 +212,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'), @@ -317,7 +316,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}") @@ -326,10 +325,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 = { @@ -339,7 +338,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_generative_ai_private_endpoint_compartment(self, generative_ai_privat "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_generative_ai_private_endpoint_compartment got unknown kwargs: {extra_kwargs!r}") @@ -448,10 +447,10 @@ def change_generative_ai_private_endpoint_compartment(self, generative_ai_privat "generativeAiPrivateEndpointId": generative_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 = { @@ -461,7 +460,7 @@ def change_generative_ai_private_endpoint_compartment(self, generative_ai_privat "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'), @@ -563,7 +562,7 @@ def change_imported_model_compartment(self, imported_model_id, change_imported_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"change_imported_model_compartment got unknown kwargs: {extra_kwargs!r}") @@ -572,10 +571,10 @@ def change_imported_model_compartment(self, imported_model_id, change_imported_m "importedModelId": imported_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 = { @@ -585,7 +584,7 @@ def change_imported_model_compartment(self, imported_model_id, change_imported_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'), @@ -687,7 +686,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}") @@ -696,10 +695,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 = { @@ -709,7 +708,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'), @@ -799,7 +798,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}") @@ -810,7 +809,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'), @@ -902,7 +901,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}") @@ -913,7 +912,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'), @@ -1003,7 +1002,7 @@ def create_generative_ai_private_endpoint(self, create_generative_ai_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_generative_ai_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1014,7 +1013,7 @@ def create_generative_ai_private_endpoint(self, create_generative_ai_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'), @@ -1106,7 +1105,7 @@ def create_imported_model(self, create_imported_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_imported_model got unknown kwargs: {extra_kwargs!r}") @@ -1117,7 +1116,7 @@ def create_imported_model(self, create_imported_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'), @@ -1209,7 +1208,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}") @@ -1220,7 +1219,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'), @@ -1313,7 +1312,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}") @@ -1322,10 +1321,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 = { @@ -1334,7 +1333,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'), @@ -1422,7 +1421,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}") @@ -1431,10 +1430,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 = { @@ -1443,7 +1442,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'), @@ -1529,7 +1528,7 @@ def delete_generative_ai_private_endpoint(self, generative_ai_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_generative_ai_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1538,10 +1537,10 @@ def delete_generative_ai_private_endpoint(self, generative_ai_private_endpoint_i "generativeAiPrivateEndpointId": generative_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 = { @@ -1550,7 +1549,7 @@ def delete_generative_ai_private_endpoint(self, generative_ai_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'), @@ -1636,7 +1635,7 @@ def delete_imported_model(self, imported_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_imported_model got unknown kwargs: {extra_kwargs!r}") @@ -1645,10 +1644,10 @@ def delete_imported_model(self, imported_model_id, **kwargs): "importedModelId": imported_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 = { @@ -1657,7 +1656,7 @@ def delete_imported_model(self, imported_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'), @@ -1743,7 +1742,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}") @@ -1752,10 +1751,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 = { @@ -1764,7 +1763,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'), @@ -1845,7 +1844,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}") @@ -1854,10 +1853,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 = { @@ -1865,7 +1864,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'), @@ -1948,7 +1947,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}") @@ -1957,10 +1956,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 = { @@ -1968,7 +1967,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'), @@ -2049,7 +2048,7 @@ def get_generative_ai_private_endpoint(self, generative_ai_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_generative_ai_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -2058,10 +2057,10 @@ def get_generative_ai_private_endpoint(self, generative_ai_private_endpoint_id, "generativeAiPrivateEndpointId": generative_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 = { @@ -2069,7 +2068,7 @@ def get_generative_ai_private_endpoint(self, generative_ai_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'), @@ -2150,7 +2149,7 @@ def get_imported_model(self, imported_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_imported_model got unknown kwargs: {extra_kwargs!r}") @@ -2159,10 +2158,10 @@ def get_imported_model(self, imported_model_id, **kwargs): "importedModelId": imported_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 = { @@ -2170,7 +2169,7 @@ def get_imported_model(self, imported_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'), @@ -2251,7 +2250,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}") @@ -2260,10 +2259,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 = { @@ -2271,7 +2270,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'), @@ -2354,7 +2353,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}") @@ -2363,10 +2362,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 = { @@ -2374,7 +2373,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'), @@ -2502,7 +2501,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}") @@ -2538,14 +2537,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'), @@ -2679,7 +2678,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}") @@ -2716,14 +2715,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'), @@ -2850,7 +2849,7 @@ def list_generative_ai_private_endpoints(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_generative_ai_private_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -2886,14 +2885,14 @@ def list_generative_ai_private_endpoints(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'), @@ -3028,7 +3027,7 @@ def list_imported_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_imported_models got unknown kwargs: {extra_kwargs!r}") @@ -3074,14 +3073,14 @@ def list_imported_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'), @@ -3216,7 +3215,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}") @@ -3262,14 +3261,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'), @@ -3380,7 +3379,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}") @@ -3389,10 +3388,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: @@ -3415,14 +3414,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'), @@ -3535,7 +3534,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}") @@ -3544,10 +3543,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: @@ -3570,14 +3569,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'), @@ -3708,7 +3707,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}") @@ -3744,14 +3743,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'), @@ -3844,7 +3843,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}") @@ -3853,10 +3852,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 = { @@ -3865,7 +3864,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'), @@ -3960,7 +3959,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}") @@ -3969,10 +3968,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 = { @@ -3981,7 +3980,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'), @@ -4074,7 +4073,7 @@ def update_generative_ai_private_endpoint(self, generative_ai_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_generative_ai_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -4083,10 +4082,10 @@ def update_generative_ai_private_endpoint(self, generative_ai_private_endpoint_i "generativeAiPrivateEndpointId": generative_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 = { @@ -4095,7 +4094,7 @@ def update_generative_ai_private_endpoint(self, generative_ai_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'), @@ -4188,7 +4187,7 @@ def update_imported_model(self, imported_model_id, update_imported_model_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_imported_model got unknown kwargs: {extra_kwargs!r}") @@ -4197,10 +4196,10 @@ def update_imported_model(self, imported_model_id, update_imported_model_details "importedModelId": imported_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 = { @@ -4209,7 +4208,7 @@ def update_imported_model(self, imported_model_id, update_imported_model_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'), @@ -4302,7 +4301,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}") @@ -4311,10 +4310,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 = { @@ -4323,7 +4322,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_agent/generative_ai_agent_client.py b/src/oci/generative_ai_agent/generative_ai_agent_client.py index 1c57a07e0e..7d7a44507b 100644 --- a/src/oci/generative_ai_agent/generative_ai_agent_client.py +++ b/src/oci/generative_ai_agent/generative_ai_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 @@ -180,7 +179,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}") @@ -189,10 +188,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 = { @@ -201,7 +200,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'), @@ -303,7 +302,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}") @@ -312,10 +311,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 = { @@ -325,7 +324,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'), @@ -430,7 +429,7 @@ def change_agent_endpoint_compartment(self, agent_endpoint_id, change_agent_endp "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_endpoint_compartment got unknown kwargs: {extra_kwargs!r}") @@ -439,10 +438,10 @@ def change_agent_endpoint_compartment(self, agent_endpoint_id, change_agent_endp "agentEndpointId": agent_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 = { @@ -452,7 +451,7 @@ def change_agent_endpoint_compartment(self, agent_endpoint_id, change_agent_endp "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -557,7 +556,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}") @@ -566,10 +565,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 = { @@ -579,7 +578,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'), @@ -669,7 +668,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}") @@ -680,7 +679,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'), @@ -770,7 +769,7 @@ def create_agent_endpoint(self, create_agent_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_agent_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -781,7 +780,7 @@ def create_agent_endpoint(self, create_agent_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'), @@ -871,7 +870,7 @@ def create_data_ingestion_job(self, create_data_ingestion_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_data_ingestion_job got unknown kwargs: {extra_kwargs!r}") @@ -882,7 +881,7 @@ def create_data_ingestion_job(self, create_data_ingestion_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'), @@ -972,7 +971,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}") @@ -983,7 +982,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'), @@ -1073,7 +1072,7 @@ def create_knowledge_base(self, create_knowledge_base_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_knowledge_base got unknown kwargs: {extra_kwargs!r}") @@ -1084,7 +1083,7 @@ def create_knowledge_base(self, create_knowledge_base_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'), @@ -1174,7 +1173,7 @@ def create_tool(self, create_tool_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_tool got unknown kwargs: {extra_kwargs!r}") @@ -1185,7 +1184,7 @@ def create_tool(self, create_tool_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'), @@ -1276,7 +1275,7 @@ def delete_agent(self, 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_agent got unknown kwargs: {extra_kwargs!r}") @@ -1285,10 +1284,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 = { @@ -1297,7 +1296,7 @@ def delete_agent(self, 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'), @@ -1385,7 +1384,7 @@ def delete_agent_endpoint(self, agent_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_agent_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1394,10 +1393,10 @@ def delete_agent_endpoint(self, agent_endpoint_id, **kwargs): "agentEndpointId": agent_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 = { @@ -1406,7 +1405,7 @@ def delete_agent_endpoint(self, agent_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'), @@ -1494,7 +1493,7 @@ def delete_data_ingestion_job(self, data_ingestion_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_data_ingestion_job got unknown kwargs: {extra_kwargs!r}") @@ -1503,10 +1502,10 @@ def delete_data_ingestion_job(self, data_ingestion_job_id, **kwargs): "dataIngestionJobId": data_ingestion_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 = { @@ -1515,7 +1514,7 @@ def delete_data_ingestion_job(self, data_ingestion_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'), @@ -1603,7 +1602,7 @@ def delete_data_source(self, data_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_data_source got unknown kwargs: {extra_kwargs!r}") @@ -1612,10 +1611,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 = { @@ -1624,7 +1623,7 @@ def delete_data_source(self, data_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'), @@ -1712,7 +1711,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}") @@ -1721,10 +1720,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 = { @@ -1733,7 +1732,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'), @@ -1821,7 +1820,7 @@ def delete_tool(self, tool_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_tool got unknown kwargs: {extra_kwargs!r}") @@ -1830,10 +1829,10 @@ def delete_tool(self, tool_id, **kwargs): "toolId": tool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1842,7 +1841,7 @@ def delete_tool(self, tool_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1923,7 +1922,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}") @@ -1932,10 +1931,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 = { @@ -1943,7 +1942,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'), @@ -2026,7 +2025,7 @@ def get_agent_endpoint(self, agent_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_agent_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -2035,10 +2034,10 @@ def get_agent_endpoint(self, agent_endpoint_id, **kwargs): "agentEndpointId": agent_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 = { @@ -2046,7 +2045,7 @@ def get_agent_endpoint(self, agent_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'), @@ -2129,7 +2128,7 @@ def get_data_ingestion_job(self, data_ingestion_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_data_ingestion_job got unknown kwargs: {extra_kwargs!r}") @@ -2138,10 +2137,10 @@ def get_data_ingestion_job(self, data_ingestion_job_id, **kwargs): "dataIngestionJobId": data_ingestion_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 = { @@ -2149,7 +2148,7 @@ def get_data_ingestion_job(self, data_ingestion_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'), @@ -2232,7 +2231,7 @@ def get_data_ingestion_job_log_content(self, data_ingestion_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_data_ingestion_job_log_content got unknown kwargs: {extra_kwargs!r}") @@ -2241,10 +2240,10 @@ def get_data_ingestion_job_log_content(self, data_ingestion_job_id, **kwargs): "dataIngestionJobId": data_ingestion_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 = { @@ -2252,7 +2251,7 @@ def get_data_ingestion_job_log_content(self, data_ingestion_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'), @@ -2335,7 +2334,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}") @@ -2344,10 +2343,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 = { @@ -2355,7 +2354,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'), @@ -2438,7 +2437,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}") @@ -2447,10 +2446,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 = { @@ -2458,7 +2457,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'), @@ -2541,7 +2540,7 @@ def get_tool(self, tool_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_tool got unknown kwargs: {extra_kwargs!r}") @@ -2550,10 +2549,10 @@ def get_tool(self, tool_id, **kwargs): "toolId": tool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2561,7 +2560,7 @@ def get_tool(self, tool_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2644,7 +2643,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}") @@ -2653,10 +2652,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 = { @@ -2664,7 +2663,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'), @@ -2794,7 +2793,7 @@ def list_agent_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_agent_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -2830,14 +2829,14 @@ def list_agent_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'), @@ -2961,7 +2960,7 @@ def list_agents(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_agents got unknown kwargs: {extra_kwargs!r}") @@ -2996,14 +2995,14 @@ def list_agents(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'), @@ -3133,7 +3132,7 @@ def list_data_ingestion_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_data_ingestion_jobs got unknown kwargs: {extra_kwargs!r}") @@ -3169,14 +3168,14 @@ def list_data_ingestion_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'), @@ -3306,7 +3305,7 @@ def list_data_sources(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_data_sources got unknown kwargs: {extra_kwargs!r}") @@ -3342,14 +3341,14 @@ def list_data_sources(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'), @@ -3473,7 +3472,7 @@ def list_knowledge_bases(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_knowledge_bases got unknown kwargs: {extra_kwargs!r}") @@ -3508,14 +3507,14 @@ def list_knowledge_bases(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'), @@ -3645,7 +3644,7 @@ def list_tools(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_tools got unknown kwargs: {extra_kwargs!r}") @@ -3681,14 +3680,14 @@ def list_tools(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'), @@ -3799,7 +3798,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}") @@ -3808,10 +3807,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: @@ -3834,14 +3833,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'), @@ -3954,7 +3953,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}") @@ -3963,10 +3962,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: @@ -3989,14 +3988,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'), @@ -4128,7 +4127,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}") @@ -4164,14 +4163,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'), @@ -4264,7 +4263,7 @@ def update_agent(self, agent_id, update_agent_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_agent got unknown kwargs: {extra_kwargs!r}") @@ -4273,10 +4272,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 = { @@ -4285,7 +4284,7 @@ def update_agent(self, agent_id, update_agent_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'), @@ -4378,7 +4377,7 @@ def update_agent_endpoint(self, agent_endpoint_id, update_agent_endpoint_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_agent_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -4387,10 +4386,10 @@ def update_agent_endpoint(self, agent_endpoint_id, update_agent_endpoint_details "agentEndpointId": agent_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 = { @@ -4399,7 +4398,7 @@ def update_agent_endpoint(self, agent_endpoint_id, update_agent_endpoint_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'), @@ -4492,7 +4491,7 @@ def update_data_source(self, data_source_id, update_data_source_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_data_source got unknown kwargs: {extra_kwargs!r}") @@ -4501,10 +4500,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 = { @@ -4513,7 +4512,7 @@ def update_data_source(self, data_source_id, update_data_source_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'), @@ -4606,7 +4605,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}") @@ -4615,10 +4614,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 = { @@ -4627,7 +4626,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'), @@ -4720,7 +4719,7 @@ def update_tool(self, tool_id, update_tool_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_tool got unknown kwargs: {extra_kwargs!r}") @@ -4729,10 +4728,10 @@ def update_tool(self, tool_id, update_tool_details, **kwargs): "toolId": tool_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4741,7 +4740,7 @@ def update_tool(self, tool_id, update_tool_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_agent_runtime/generative_ai_agent_runtime_client.py b/src/oci/generative_ai_agent_runtime/generative_ai_agent_runtime_client.py index 268873b990..743f5e704a 100644 --- a/src/oci/generative_ai_agent_runtime/generative_ai_agent_runtime_client.py +++ b/src/oci/generative_ai_agent_runtime/generative_ai_agent_runtime_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 chat(self, agent_endpoint_id, chat_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"chat got unknown kwargs: {extra_kwargs!r}") @@ -196,10 +195,10 @@ def chat(self, agent_endpoint_id, chat_details, **kwargs): "agentEndpointId": agent_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 = { @@ -209,7 +208,7 @@ def chat(self, agent_endpoint_id, chat_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'), @@ -303,7 +302,7 @@ def create_session(self, create_session_details, agent_endpoint_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_session got unknown kwargs: {extra_kwargs!r}") @@ -312,10 +311,10 @@ def create_session(self, create_session_details, agent_endpoint_id, **kwargs): "agentEndpointId": agent_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 = { @@ -324,7 +323,7 @@ def create_session(self, create_session_details, agent_endpoint_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'), @@ -416,7 +415,7 @@ def delete_session(self, agent_endpoint_id, 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}") @@ -426,10 +425,10 @@ def delete_session(self, agent_endpoint_id, 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 = { @@ -438,7 +437,7 @@ def delete_session(self, agent_endpoint_id, 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'), @@ -517,7 +516,7 @@ def get_session(self, agent_endpoint_id, 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}") @@ -527,10 +526,10 @@ def get_session(self, agent_endpoint_id, 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 = { @@ -538,7 +537,7 @@ def get_session(self, agent_endpoint_id, 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'), @@ -635,7 +634,7 @@ def retrieve_metadata(self, knowledge_base_id, retrieve_metadata_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"retrieve_metadata got unknown kwargs: {extra_kwargs!r}") @@ -644,10 +643,10 @@ def retrieve_metadata(self, knowledge_base_id, retrieve_metadata_details, **kwar "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 = { @@ -657,7 +656,7 @@ def retrieve_metadata(self, knowledge_base_id, retrieve_metadata_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'), @@ -752,7 +751,7 @@ def update_session(self, agent_endpoint_id, session_id, update_session_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_session got unknown kwargs: {extra_kwargs!r}") @@ -762,10 +761,10 @@ def update_session(self, agent_endpoint_id, session_id, update_session_details, "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 = { @@ -774,7 +773,7 @@ def update_session(self, agent_endpoint_id, session_id, update_session_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/generative_ai_inference/generative_ai_inference_client.py b/src/oci/generative_ai_inference/generative_ai_inference_client.py index 7e05c47064..45998e054a 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 @@ -173,7 +172,7 @@ def apply_guardrails(self, apply_guardrails_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"apply_guardrails got unknown kwargs: {extra_kwargs!r}") @@ -184,7 +183,7 @@ def apply_guardrails(self, apply_guardrails_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'), @@ -270,7 +269,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}") @@ -281,7 +280,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'), @@ -369,7 +368,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}") @@ -380,7 +379,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'), @@ -466,7 +465,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}") @@ -477,7 +476,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'), @@ -565,7 +564,7 @@ def rerank_text(self, rerank_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"rerank_text got unknown kwargs: {extra_kwargs!r}") @@ -576,7 +575,7 @@ def rerank_text(self, rerank_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'), @@ -662,7 +661,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}") @@ -673,7 +672,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 1c78d51c72..57c4c39cc8 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 @@ -171,7 +170,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}") @@ -180,10 +179,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 = { @@ -191,7 +190,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'), @@ -286,7 +285,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}") @@ -297,10 +296,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 = { @@ -308,7 +307,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'), @@ -418,7 +417,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}") @@ -429,10 +428,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 = { @@ -440,7 +439,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: @@ -449,7 +448,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 5b3ced5c0f..c1ef0a561f 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 @@ -179,7 +178,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}") @@ -188,10 +187,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 = { @@ -201,7 +200,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'), @@ -299,7 +298,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}") @@ -308,10 +307,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 = { @@ -321,7 +320,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'), @@ -422,7 +421,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}") @@ -431,10 +430,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 = { @@ -444,7 +443,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'), @@ -548,7 +547,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}") @@ -557,16 +556,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", @@ -575,7 +574,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'), @@ -662,7 +661,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}") @@ -673,7 +672,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'), @@ -760,7 +759,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}") @@ -771,7 +770,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'), @@ -866,7 +865,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}") @@ -875,10 +874,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 = { @@ -888,7 +887,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'), @@ -981,7 +980,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}") @@ -990,10 +989,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 = { @@ -1003,7 +1002,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'), @@ -1099,7 +1098,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}") @@ -1108,10 +1107,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 = { @@ -1121,7 +1120,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'), @@ -1216,7 +1215,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}") @@ -1225,10 +1224,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 = { @@ -1238,7 +1237,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'), @@ -1325,7 +1324,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}") @@ -1336,7 +1335,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'), @@ -1437,7 +1436,7 @@ def generate_gsm_certificate_signing_request(self, sharded_database_id, **kwargs "opc_retry_token", "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"generate_gsm_certificate_signing_request got unknown kwargs: {extra_kwargs!r}") @@ -1446,16 +1445,16 @@ 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') query_params = { "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", @@ -1464,7 +1463,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'), @@ -1562,7 +1561,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}") @@ -1571,10 +1570,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 = { @@ -1584,7 +1583,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'), @@ -1673,7 +1672,7 @@ def get_private_endpoint(self, private_endpoint_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_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1682,10 +1681,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 = { @@ -1694,7 +1693,7 @@ def get_private_endpoint(self, private_endpoint_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'), @@ -1785,7 +1784,7 @@ def get_sharded_database(self, sharded_database_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_sharded_database got unknown kwargs: {extra_kwargs!r}") @@ -1794,16 +1793,16 @@ 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", @@ -1811,7 +1810,7 @@ def get_sharded_database(self, sharded_database_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'), @@ -1891,7 +1890,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}") @@ -1900,10 +1899,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 = { @@ -1911,7 +1910,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'), @@ -2019,7 +2018,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}") @@ -2054,14 +2053,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'), @@ -2169,7 +2168,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}") @@ -2204,14 +2203,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'), @@ -2309,7 +2308,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}") @@ -2318,10 +2317,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: @@ -2344,14 +2343,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'), @@ -2451,7 +2450,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}") @@ -2460,10 +2459,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: @@ -2486,14 +2485,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'), @@ -2607,7 +2606,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}") @@ -2643,14 +2642,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'), @@ -2741,7 +2740,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}") @@ -2750,10 +2749,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 = { @@ -2762,7 +2761,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'), @@ -2851,7 +2850,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}") @@ -2859,7 +2858,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", @@ -2867,7 +2866,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'), @@ -2964,7 +2963,7 @@ def reinstate_proxy_instance(self, private_endpoint_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"reinstate_proxy_instance got unknown kwargs: {extra_kwargs!r}") @@ -2973,10 +2972,10 @@ def reinstate_proxy_instance(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 = { @@ -2986,7 +2985,7 @@ def reinstate_proxy_instance(self, private_endpoint_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'), @@ -3079,7 +3078,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}") @@ -3088,10 +3087,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 = { @@ -3101,7 +3100,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'), @@ -3194,7 +3193,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}") @@ -3203,10 +3202,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 = { @@ -3216,7 +3215,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'), @@ -3312,7 +3311,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}") @@ -3321,10 +3320,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 = { @@ -3334,7 +3333,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'), @@ -3426,7 +3425,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}") @@ -3435,10 +3434,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 = { @@ -3447,7 +3446,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'), @@ -3549,7 +3548,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}") @@ -3558,10 +3557,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 = { @@ -3571,7 +3570,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'), @@ -3678,7 +3677,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}") @@ -3687,10 +3686,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 = { @@ -3698,7 +3697,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", @@ -3707,7 +3706,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 96d357b168..b3f5b4e46f 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 @@ -172,7 +171,7 @@ def add_connection_lock(self, connection_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_connection_lock got unknown kwargs: {extra_kwargs!r}") @@ -181,10 +180,10 @@ def add_connection_lock(self, connection_id, add_resource_lock_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 = { @@ -193,7 +192,7 @@ def add_connection_lock(self, connection_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'), @@ -283,7 +282,7 @@ def add_deployment_backup_lock(self, deployment_backup_id, add_resource_lock_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"add_deployment_backup_lock got unknown kwargs: {extra_kwargs!r}") @@ -292,10 +291,10 @@ def add_deployment_backup_lock(self, deployment_backup_id, add_resource_lock_det "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 = { @@ -304,7 +303,7 @@ def add_deployment_backup_lock(self, deployment_backup_id, add_resource_lock_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'), @@ -401,7 +400,7 @@ def add_deployment_local_peer(self, deployment_id, add_deployment_local_peer_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"add_deployment_local_peer got unknown kwargs: {extra_kwargs!r}") @@ -410,10 +409,10 @@ def add_deployment_local_peer(self, deployment_id, add_deployment_local_peer_det "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 = { @@ -423,7 +422,7 @@ def add_deployment_local_peer(self, deployment_id, add_deployment_local_peer_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'), @@ -512,7 +511,7 @@ def add_deployment_lock(self, deployment_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_deployment_lock got unknown kwargs: {extra_kwargs!r}") @@ -521,10 +520,10 @@ def add_deployment_lock(self, deployment_id, add_resource_lock_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 = { @@ -533,7 +532,7 @@ def add_deployment_lock(self, deployment_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'), @@ -634,7 +633,7 @@ def cancel_deployment_backup(self, deployment_backup_id, cancel_deployment_backu "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"cancel_deployment_backup got unknown kwargs: {extra_kwargs!r}") @@ -643,16 +642,16 @@ 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') 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", @@ -661,7 +660,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'), @@ -759,7 +758,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}") @@ -768,10 +767,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 = { @@ -781,7 +780,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'), @@ -879,7 +878,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}") @@ -888,10 +887,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 = { @@ -901,7 +900,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'), @@ -1001,7 +1000,7 @@ def change_connection_compartment(self, connection_id, change_connection_compart "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_connection_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1010,16 +1009,16 @@ 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') 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", @@ -1027,7 +1026,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'), @@ -1126,7 +1125,7 @@ def change_connection_subscription(self, change_connection_subscription_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_connection_subscription got unknown kwargs: {extra_kwargs!r}") @@ -1135,10 +1134,10 @@ def change_connection_subscription(self, change_connection_subscription_details, "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 = { @@ -1148,7 +1147,7 @@ def change_connection_subscription(self, change_connection_subscription_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'), @@ -1250,7 +1249,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}") @@ -1259,10 +1258,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 = { @@ -1272,7 +1271,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'), @@ -1377,7 +1376,7 @@ def change_deployment_backup_compartment(self, deployment_backup_id, change_depl "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_deployment_backup_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1386,16 +1385,16 @@ 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') 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", @@ -1404,7 +1403,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'), @@ -1511,7 +1510,7 @@ def change_deployment_compartment(self, deployment_id, change_deployment_compart "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_deployment_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1520,16 +1519,16 @@ 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') 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", @@ -1538,7 +1537,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'), @@ -1636,7 +1635,7 @@ def change_deployment_subscription(self, change_deployment_subscription_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_deployment_subscription got unknown kwargs: {extra_kwargs!r}") @@ -1645,10 +1644,10 @@ def change_deployment_subscription(self, change_deployment_subscription_details, "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 = { @@ -1658,7 +1657,7 @@ def change_deployment_subscription(self, change_deployment_subscription_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'), @@ -1765,7 +1764,7 @@ def change_pipeline_compartment(self, pipeline_id, change_pipeline_compartment_d "is_lock_override", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -1774,16 +1773,16 @@ 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') 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", @@ -1792,7 +1791,7 @@ def change_pipeline_compartment(self, pipeline_id, change_pipeline_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'), @@ -1890,7 +1889,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}") @@ -1899,10 +1898,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 = { @@ -1912,7 +1911,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'), @@ -2010,7 +2009,7 @@ def collect_pipeline_diagnostic(self, pipeline_id, collect_pipeline_diagnostic_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"collect_pipeline_diagnostic got unknown kwargs: {extra_kwargs!r}") @@ -2019,10 +2018,10 @@ def collect_pipeline_diagnostic(self, pipeline_id, collect_pipeline_diagnostic_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 = { @@ -2032,7 +2031,7 @@ def collect_pipeline_diagnostic(self, pipeline_id, collect_pipeline_diagnostic_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'), @@ -2128,7 +2127,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}") @@ -2137,10 +2136,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 = { @@ -2150,7 +2149,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'), @@ -2245,7 +2244,7 @@ def create_certificate(self, create_certificate_details, deployment_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"create_certificate got unknown kwargs: {extra_kwargs!r}") @@ -2254,16 +2253,16 @@ 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') 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", @@ -2271,7 +2270,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'), @@ -2359,7 +2358,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}") @@ -2370,7 +2369,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'), @@ -2460,7 +2459,7 @@ def create_connection_assignment(self, create_connection_assignment_details, **k "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"create_connection_assignment got unknown kwargs: {extra_kwargs!r}") @@ -2468,7 +2467,7 @@ def create_connection_assignment(self, create_connection_assignment_details, **k 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", @@ -2476,7 +2475,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'), @@ -2565,7 +2564,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}") @@ -2576,7 +2575,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'), @@ -2662,7 +2661,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}") @@ -2673,7 +2672,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'), @@ -2759,7 +2758,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}") @@ -2770,7 +2769,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'), @@ -2856,7 +2855,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}") @@ -2867,7 +2866,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'), @@ -2960,7 +2959,7 @@ def delete_certificate(self, deployment_id, certificate_key, **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_certificate got unknown kwargs: {extra_kwargs!r}") @@ -2970,16 +2969,16 @@ 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') 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", @@ -2987,7 +2986,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'), @@ -3078,7 +3077,7 @@ def delete_connection(self, connection_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_connection got unknown kwargs: {extra_kwargs!r}") @@ -3087,16 +3086,16 @@ 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') 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", @@ -3104,7 +3103,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'), @@ -3195,7 +3194,7 @@ def delete_connection_assignment(self, connection_assignment_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_connection_assignment got unknown kwargs: {extra_kwargs!r}") @@ -3204,16 +3203,16 @@ 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') 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", @@ -3221,7 +3220,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'), @@ -3307,7 +3306,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}") @@ -3316,10 +3315,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 = { @@ -3328,7 +3327,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'), @@ -3415,7 +3414,7 @@ def delete_deployment(self, deployment_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_deployment got unknown kwargs: {extra_kwargs!r}") @@ -3424,16 +3423,16 @@ 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') 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", @@ -3441,7 +3440,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'), @@ -3530,7 +3529,7 @@ def delete_deployment_backup(self, deployment_backup_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_deployment_backup got unknown kwargs: {extra_kwargs!r}") @@ -3539,16 +3538,16 @@ 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') 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", @@ -3556,7 +3555,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'), @@ -3647,7 +3646,7 @@ def delete_pipeline(self, pipeline_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_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -3656,16 +3655,16 @@ 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 = { "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", @@ -3673,7 +3672,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'), @@ -3768,7 +3767,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}") @@ -3777,10 +3776,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 = { @@ -3790,7 +3789,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'), @@ -3888,7 +3887,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}") @@ -3897,10 +3896,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 = { @@ -3910,7 +3909,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'), @@ -4006,7 +4005,7 @@ def generate_library_url(self, deployment_id, generate_library_url_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"generate_library_url got unknown kwargs: {extra_kwargs!r}") @@ -4015,10 +4014,10 @@ def generate_library_url(self, deployment_id, generate_library_url_details, **kw "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 = { @@ -4028,7 +4027,7 @@ def generate_library_url(self, deployment_id, generate_library_url_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'), @@ -4112,7 +4111,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}") @@ -4122,10 +4121,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 = { @@ -4133,7 +4132,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'), @@ -4219,7 +4218,7 @@ def get_connection(self, connection_id, **kwargs): "opc_request_id", "view" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -4228,10 +4227,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') if 'view' in kwargs: @@ -4244,14 +4243,14 @@ def get_connection(self, connection_id, **kwargs): query_params = { "view": kwargs.get("view", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -4342,10 +4341,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 = { @@ -4353,7 +4352,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'), @@ -4432,7 +4431,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}") @@ -4441,10 +4440,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 = { @@ -4452,7 +4451,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'), @@ -4530,7 +4529,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}") @@ -4539,10 +4538,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 = { @@ -4550,7 +4549,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'), @@ -4628,7 +4627,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}") @@ -4637,10 +4636,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 = { @@ -4648,7 +4647,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'), @@ -4726,7 +4725,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}") @@ -4735,10 +4734,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 = { @@ -4746,7 +4745,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'), @@ -4826,7 +4825,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}") @@ -4835,10 +4834,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 = { @@ -4846,7 +4845,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'), @@ -4926,7 +4925,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}") @@ -4935,10 +4934,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 = { @@ -4946,7 +4945,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'), @@ -5045,7 +5044,7 @@ def import_deployment_wallet(self, deployment_id, import_deployment_wallet_detai "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"import_deployment_wallet got unknown kwargs: {extra_kwargs!r}") @@ -5054,16 +5053,16 @@ 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') 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", @@ -5072,7 +5071,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'), @@ -5182,7 +5181,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}") @@ -5191,10 +5190,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: @@ -5225,14 +5224,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'), @@ -5360,7 +5359,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}") @@ -5397,14 +5396,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'), @@ -5544,7 +5543,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}") @@ -5607,14 +5606,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'), @@ -5729,7 +5728,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}") @@ -5764,14 +5763,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'), @@ -5891,7 +5890,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}") @@ -5927,14 +5926,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'), @@ -6038,7 +6037,7 @@ def list_deployment_environments(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_environments got unknown kwargs: {extra_kwargs!r}") @@ -6064,14 +6063,14 @@ def list_deployment_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'), @@ -6182,7 +6181,7 @@ def list_deployment_peers(self, deployment_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_peers got unknown kwargs: {extra_kwargs!r}") @@ -6191,10 +6190,10 @@ def list_deployment_peers(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: @@ -6226,14 +6225,14 @@ def list_deployment_peers(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'), @@ -6353,7 +6352,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}") @@ -6389,14 +6388,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'), @@ -6516,7 +6515,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}") @@ -6552,14 +6551,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'), @@ -6675,7 +6674,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}") @@ -6710,14 +6709,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'), @@ -6821,7 +6820,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}") @@ -6830,10 +6829,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: @@ -6857,14 +6856,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'), @@ -7010,7 +7009,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}") @@ -7072,14 +7071,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'), @@ -7166,7 +7165,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}") @@ -7176,14 +7175,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'), @@ -7263,7 +7262,7 @@ def list_pipeline_initialization_steps(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"list_pipeline_initialization_steps got unknown kwargs: {extra_kwargs!r}") @@ -7272,10 +7271,10 @@ def list_pipeline_initialization_steps(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 = { @@ -7283,7 +7282,7 @@ def list_pipeline_initialization_steps(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'), @@ -7386,7 +7385,7 @@ def list_pipeline_running_processes(self, pipeline_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_running_processes got unknown kwargs: {extra_kwargs!r}") @@ -7395,10 +7394,10 @@ def list_pipeline_running_processes(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') if 'sort_order' in kwargs: @@ -7421,14 +7420,14 @@ def list_pipeline_running_processes(self, pipeline_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7543,7 +7542,7 @@ def list_pipeline_schema_tables(self, pipeline_id, source_schema_name, target_sc "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_pipeline_schema_tables got unknown kwargs: {extra_kwargs!r}") @@ -7552,10 +7551,10 @@ def list_pipeline_schema_tables(self, pipeline_id, source_schema_name, target_sc "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') if 'sort_order' in kwargs: @@ -7581,14 +7580,14 @@ def list_pipeline_schema_tables(self, pipeline_id, source_schema_name, target_sc "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7697,7 +7696,7 @@ def list_pipeline_schemas(self, pipeline_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_pipeline_schemas got unknown kwargs: {extra_kwargs!r}") @@ -7706,10 +7705,10 @@ def list_pipeline_schemas(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') if 'sort_order' in kwargs: @@ -7733,14 +7732,14 @@ def list_pipeline_schemas(self, pipeline_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7862,7 +7861,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}") @@ -7905,14 +7904,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'), @@ -8026,7 +8025,7 @@ def list_recipes(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_recipes got unknown kwargs: {extra_kwargs!r}") @@ -8061,14 +8060,14 @@ def list_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'), @@ -8178,7 +8177,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}") @@ -8206,14 +8205,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'), @@ -8326,7 +8325,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}") @@ -8355,14 +8354,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'), @@ -8451,7 +8450,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}") @@ -8460,24 +8459,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'), @@ -8568,7 +8567,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}") @@ -8577,24 +8576,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'), @@ -8692,7 +8691,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}") @@ -8703,14 +8702,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'), @@ -8811,7 +8810,7 @@ def pause_pipeline(self, pipeline_id, pause_pipeline_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"pause_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -8820,16 +8819,16 @@ def pause_pipeline(self, pipeline_id, pause_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') 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", @@ -8838,7 +8837,7 @@ def pause_pipeline(self, pipeline_id, pause_pipeline_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'), @@ -8935,7 +8934,7 @@ def refresh_connection(self, connection_id, refresh_connection_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"refresh_connection got unknown kwargs: {extra_kwargs!r}") @@ -8944,16 +8943,16 @@ def refresh_connection(self, connection_id, refresh_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') 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", @@ -8961,7 +8960,7 @@ def refresh_connection(self, connection_id, refresh_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'), @@ -9053,7 +9052,7 @@ def remove_connection_lock(self, connection_id, remove_resource_lock_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"remove_connection_lock got unknown kwargs: {extra_kwargs!r}") @@ -9062,10 +9061,10 @@ def remove_connection_lock(self, connection_id, remove_resource_lock_details, ** "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 = { @@ -9074,7 +9073,7 @@ def remove_connection_lock(self, connection_id, remove_resource_lock_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'), @@ -9164,7 +9163,7 @@ def remove_deployment_backup_lock(self, deployment_backup_id, remove_resource_lo "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_deployment_backup_lock got unknown kwargs: {extra_kwargs!r}") @@ -9173,10 +9172,10 @@ def remove_deployment_backup_lock(self, deployment_backup_id, remove_resource_lo "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 = { @@ -9185,7 +9184,7 @@ def remove_deployment_backup_lock(self, deployment_backup_id, remove_resource_lo "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9282,7 +9281,7 @@ def remove_deployment_local_peer(self, deployment_id, remove_deployment_local_pe "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_deployment_local_peer got unknown kwargs: {extra_kwargs!r}") @@ -9291,10 +9290,10 @@ def remove_deployment_local_peer(self, deployment_id, remove_deployment_local_pe "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 = { @@ -9304,7 +9303,7 @@ def remove_deployment_local_peer(self, deployment_id, remove_deployment_local_pe "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9393,7 +9392,7 @@ def remove_deployment_lock(self, deployment_id, remove_resource_lock_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"remove_deployment_lock got unknown kwargs: {extra_kwargs!r}") @@ -9402,10 +9401,10 @@ def remove_deployment_lock(self, deployment_id, remove_resource_lock_details, ** "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 = { @@ -9414,7 +9413,7 @@ def remove_deployment_lock(self, deployment_id, remove_resource_lock_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'), @@ -9511,7 +9510,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}") @@ -9520,10 +9519,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 = { @@ -9533,7 +9532,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'), @@ -9635,7 +9634,7 @@ def restore_deployment(self, deployment_backup_id, restore_deployment_details, * "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"restore_deployment got unknown kwargs: {extra_kwargs!r}") @@ -9644,16 +9643,16 @@ 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') 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", @@ -9662,7 +9661,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'), @@ -9764,7 +9763,7 @@ def rollback_deployment_upgrade(self, deployment_upgrade_id, rollback_deployment "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"rollback_deployment_upgrade got unknown kwargs: {extra_kwargs!r}") @@ -9773,16 +9772,16 @@ 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') 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", @@ -9791,7 +9790,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'), @@ -9889,7 +9888,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}") @@ -9898,10 +9897,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 = { @@ -9911,7 +9910,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'), @@ -10011,7 +10010,7 @@ def start_deployment(self, deployment_id, start_deployment_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"start_deployment got unknown kwargs: {extra_kwargs!r}") @@ -10020,16 +10019,16 @@ 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') 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", @@ -10038,7 +10037,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'), @@ -10142,7 +10141,7 @@ def start_pipeline(self, pipeline_id, start_pipeline_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"start_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -10151,16 +10150,16 @@ def start_pipeline(self, pipeline_id, start_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') 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", @@ -10169,7 +10168,7 @@ def start_pipeline(self, pipeline_id, start_pipeline_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'), @@ -10271,7 +10270,7 @@ def stop_deployment(self, deployment_id, stop_deployment_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"stop_deployment got unknown kwargs: {extra_kwargs!r}") @@ -10280,16 +10279,16 @@ 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') 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", @@ -10298,7 +10297,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'), @@ -10402,7 +10401,7 @@ def stop_pipeline(self, pipeline_id, stop_pipeline_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"stop_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -10411,16 +10410,16 @@ def stop_pipeline(self, pipeline_id, stop_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') 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", @@ -10429,7 +10428,7 @@ def stop_pipeline(self, pipeline_id, stop_pipeline_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'), @@ -10527,7 +10526,7 @@ def switchover_deployment_peer(self, deployment_id, switchover_deployment_peer_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"switchover_deployment_peer got unknown kwargs: {extra_kwargs!r}") @@ -10536,10 +10535,10 @@ def switchover_deployment_peer(self, deployment_id, switchover_deployment_peer_d "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 = { @@ -10549,7 +10548,7 @@ def switchover_deployment_peer(self, deployment_id, switchover_deployment_peer_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'), @@ -10648,7 +10647,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}") @@ -10657,10 +10656,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 = { @@ -10670,7 +10669,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'), @@ -10771,7 +10770,7 @@ def test_pipeline_connection(self, pipeline_id, test_pipeline_connection_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"test_pipeline_connection got unknown kwargs: {extra_kwargs!r}") @@ -10780,10 +10779,10 @@ def test_pipeline_connection(self, pipeline_id, test_pipeline_connection_details "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 = { @@ -10793,7 +10792,7 @@ def test_pipeline_connection(self, pipeline_id, test_pipeline_connection_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'), @@ -10890,7 +10889,7 @@ def update_connection(self, connection_id, update_connection_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_connection got unknown kwargs: {extra_kwargs!r}") @@ -10899,16 +10898,16 @@ 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') 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", @@ -10916,7 +10915,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'), @@ -11007,7 +11006,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}") @@ -11016,10 +11015,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 = { @@ -11028,7 +11027,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'), @@ -11120,7 +11119,7 @@ def update_deployment(self, deployment_id, update_deployment_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_deployment got unknown kwargs: {extra_kwargs!r}") @@ -11129,16 +11128,16 @@ 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') 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", @@ -11146,7 +11145,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'), @@ -11240,7 +11239,7 @@ def update_deployment_backup(self, deployment_backup_id, update_deployment_backu "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_deployment_backup got unknown kwargs: {extra_kwargs!r}") @@ -11249,16 +11248,16 @@ 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') 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", @@ -11266,7 +11265,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'), @@ -11364,7 +11363,7 @@ def update_pipeline(self, pipeline_id, update_pipeline_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_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -11373,16 +11372,16 @@ 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') 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", @@ -11390,7 +11389,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'), @@ -11491,7 +11490,7 @@ def upgrade_deployment(self, deployment_id, upgrade_deployment_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"upgrade_deployment got unknown kwargs: {extra_kwargs!r}") @@ -11500,16 +11499,16 @@ 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') 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", @@ -11518,7 +11517,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'), @@ -11620,7 +11619,7 @@ def upgrade_deployment_upgrade(self, deployment_upgrade_id, upgrade_deployment_u "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"upgrade_deployment_upgrade got unknown kwargs: {extra_kwargs!r}") @@ -11629,16 +11628,16 @@ 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') 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", @@ -11647,7 +11646,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 b5e824f9ae..de607bbf0f 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 @@ -168,7 +167,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}") @@ -179,7 +178,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'), @@ -264,7 +263,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}") @@ -275,7 +274,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'), @@ -360,7 +359,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}") @@ -369,10 +368,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 = { @@ -381,7 +380,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'), @@ -463,7 +462,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}") @@ -472,10 +471,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 = { @@ -484,7 +483,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'), @@ -558,7 +557,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}") @@ -567,10 +566,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 = { @@ -578,7 +577,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'), @@ -654,7 +653,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}") @@ -663,10 +662,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 = { @@ -674,7 +673,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'), @@ -750,7 +749,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}") @@ -759,10 +758,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 = { @@ -770,7 +769,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'), @@ -846,7 +845,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}") @@ -855,10 +854,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 = { @@ -866,7 +865,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'), @@ -978,7 +977,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}") @@ -1014,14 +1013,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'), @@ -1139,7 +1138,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}") @@ -1183,14 +1182,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'), @@ -1297,7 +1296,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}") @@ -1332,14 +1331,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'), @@ -1455,7 +1454,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}") @@ -1492,14 +1491,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'), @@ -1593,7 +1592,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}") @@ -1602,10 +1601,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 = { @@ -1615,7 +1614,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'), @@ -1707,7 +1706,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}") @@ -1716,10 +1715,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 = { @@ -1729,7 +1728,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'), @@ -1815,7 +1814,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}") @@ -1824,10 +1823,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 = { @@ -1836,7 +1835,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 aebc5258d1..0c8691bf09 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 @@ -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'), @@ -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'), @@ -379,7 +378,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}") @@ -388,10 +387,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: @@ -414,14 +413,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'), @@ -519,7 +518,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}") @@ -528,10 +527,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: @@ -554,14 +553,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'), @@ -674,7 +673,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}") @@ -710,14 +709,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 54de34a7fc..4fd3be307f 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 @@ -183,7 +182,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}") @@ -192,10 +191,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 = { @@ -205,7 +204,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'), @@ -303,7 +302,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}") @@ -312,10 +311,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 = { @@ -325,7 +324,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'), @@ -414,7 +413,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}") @@ -425,7 +424,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'), @@ -506,7 +505,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}") @@ -516,7 +515,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'), @@ -596,7 +595,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}") @@ -606,7 +605,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'), @@ -694,7 +693,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}") @@ -705,7 +704,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'), @@ -791,7 +790,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}") @@ -800,10 +799,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 = { @@ -812,7 +811,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'), @@ -895,7 +894,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}") @@ -904,10 +903,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 = { @@ -916,7 +915,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'), @@ -998,7 +997,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}") @@ -1007,10 +1006,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 = { @@ -1019,7 +1018,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'), @@ -1103,7 +1102,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}") @@ -1112,10 +1111,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 = { @@ -1124,7 +1123,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'), @@ -1227,7 +1226,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}") @@ -1254,14 +1253,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'), @@ -1367,7 +1366,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}") @@ -1395,14 +1394,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'), @@ -1508,7 +1507,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}") @@ -1517,10 +1516,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: @@ -1538,14 +1537,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'), @@ -1656,7 +1655,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}") @@ -1684,14 +1683,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'), @@ -1801,7 +1800,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}") @@ -1810,10 +1809,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: @@ -1831,14 +1830,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'), @@ -1929,7 +1928,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}") @@ -1938,10 +1937,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 = { @@ -1950,7 +1949,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'), @@ -2041,7 +2040,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}") @@ -2050,10 +2049,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 = { @@ -2062,7 +2061,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 97daba9dff..5f19f48f61 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 @@ -181,7 +180,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}") @@ -190,10 +189,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 = { @@ -203,7 +202,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'), @@ -296,7 +295,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}") @@ -306,10 +305,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 = { @@ -318,7 +317,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'), @@ -417,7 +416,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}") @@ -426,10 +425,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 = { @@ -439,7 +438,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'), @@ -538,7 +537,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}") @@ -547,10 +546,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 = { @@ -560,7 +559,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'), @@ -648,7 +647,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}") @@ -658,7 +657,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'), @@ -742,7 +741,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}") @@ -758,7 +757,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", @@ -859,7 +858,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}") @@ -868,10 +867,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 = { @@ -880,7 +879,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'), @@ -992,7 +991,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}") @@ -1000,7 +999,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", @@ -1008,7 +1007,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'), @@ -1110,7 +1109,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}") @@ -1121,7 +1120,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'), @@ -1216,7 +1215,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}") @@ -1225,10 +1224,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 = { @@ -1237,7 +1236,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'), @@ -1353,7 +1352,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}") @@ -1362,16 +1361,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", @@ -1380,7 +1379,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'), @@ -1480,7 +1479,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}") @@ -1489,10 +1488,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 = { @@ -1502,7 +1501,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'), @@ -1607,7 +1606,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}") @@ -1616,10 +1615,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 = { @@ -1629,7 +1628,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'), @@ -1726,7 +1725,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}") @@ -1735,23 +1734,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'), @@ -1850,7 +1849,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}") @@ -1859,10 +1858,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 = { @@ -1870,7 +1869,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'), @@ -1974,7 +1973,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}") @@ -1984,7 +1983,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'), @@ -2082,7 +2081,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}") @@ -2091,10 +2090,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 = { @@ -2102,7 +2101,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'), @@ -2195,7 +2194,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}") @@ -2204,10 +2203,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 = { @@ -2216,7 +2215,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'), @@ -2313,7 +2312,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}") @@ -2324,7 +2323,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'), @@ -2425,7 +2424,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}") @@ -2435,7 +2434,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'), @@ -2541,7 +2540,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}") @@ -2551,7 +2550,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'), @@ -2657,7 +2656,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}") @@ -2667,7 +2666,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'), @@ -2758,7 +2757,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}") @@ -2767,10 +2766,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 = { @@ -2778,7 +2777,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'), @@ -2863,7 +2862,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}") @@ -2872,10 +2871,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 = { @@ -2883,7 +2882,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'), @@ -2990,7 +2989,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}") @@ -3000,7 +2999,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'), @@ -3086,7 +3085,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}") @@ -3095,10 +3094,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 = { @@ -3106,7 +3105,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'), @@ -3207,7 +3206,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}") @@ -3216,10 +3215,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 = { @@ -3227,7 +3226,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'), @@ -3330,7 +3329,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}") @@ -3340,7 +3339,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'), @@ -3426,7 +3425,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}") @@ -3435,10 +3434,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 = { @@ -3446,7 +3445,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'), @@ -3537,7 +3536,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}") @@ -3546,10 +3545,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 = { @@ -3557,7 +3556,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'), @@ -3658,7 +3657,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}") @@ -3667,10 +3666,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 = { @@ -3678,7 +3677,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'), @@ -3791,7 +3790,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}") @@ -3800,23 +3799,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'), @@ -3915,7 +3914,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}") @@ -3926,7 +3925,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'), @@ -4022,7 +4021,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}") @@ -4032,7 +4031,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'), @@ -4153,7 +4152,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}") @@ -4163,7 +4162,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'), @@ -4265,7 +4264,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}") @@ -4274,10 +4273,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 = { @@ -4287,7 +4286,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'), @@ -4374,7 +4373,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}") @@ -4384,10 +4383,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 = { @@ -4395,7 +4394,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'), @@ -4476,7 +4475,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}") @@ -4486,10 +4485,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 = { @@ -4497,7 +4496,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'), @@ -4575,7 +4574,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}") @@ -4584,10 +4583,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 = { @@ -4595,7 +4594,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'), @@ -4676,7 +4675,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}") @@ -4686,10 +4685,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 = { @@ -4697,7 +4696,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'), @@ -4783,7 +4782,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}") @@ -4793,10 +4792,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 = { @@ -4805,7 +4804,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'), @@ -4894,7 +4893,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}") @@ -4903,10 +4902,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 = { @@ -4915,7 +4914,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'), @@ -4993,7 +4992,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}") @@ -5002,10 +5001,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 = { @@ -5013,7 +5012,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'), @@ -5091,7 +5090,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}") @@ -5100,10 +5099,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 = { @@ -5111,7 +5110,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'), @@ -5194,7 +5193,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}") @@ -5203,10 +5202,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 = { @@ -5214,7 +5213,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'), @@ -5299,7 +5298,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}") @@ -5309,10 +5308,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 = { @@ -5320,7 +5319,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'), @@ -5401,7 +5400,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}") @@ -5411,10 +5410,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 = { @@ -5422,7 +5421,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'), @@ -5500,7 +5499,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}") @@ -5509,10 +5508,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 = { @@ -5520,7 +5519,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'), @@ -5601,7 +5600,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}") @@ -5611,10 +5610,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 = { @@ -5622,7 +5621,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'), @@ -5700,7 +5699,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}") @@ -5709,10 +5708,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 = { @@ -5720,7 +5719,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'), @@ -5801,7 +5800,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}") @@ -5811,10 +5810,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 = { @@ -5822,7 +5821,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'), @@ -5905,7 +5904,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}") @@ -5915,10 +5914,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 = { @@ -5926,7 +5925,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'), @@ -6030,7 +6029,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}") @@ -6040,23 +6039,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'), @@ -6145,7 +6144,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}") @@ -6154,16 +6153,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", @@ -6171,7 +6170,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'), @@ -6266,7 +6265,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}") @@ -6275,16 +6274,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", @@ -6292,7 +6291,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'), @@ -6372,7 +6371,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}") @@ -6381,10 +6380,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 = { @@ -6392,7 +6391,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'), @@ -6495,7 +6494,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}") @@ -6504,10 +6503,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 = { @@ -6517,7 +6516,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'), @@ -6601,7 +6600,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}") @@ -6611,10 +6610,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 = { @@ -6622,7 +6621,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'), @@ -6693,7 +6692,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}") @@ -6702,10 +6701,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 = { @@ -6788,7 +6787,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}") @@ -6797,10 +6796,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 = { @@ -6885,7 +6884,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}") @@ -6894,10 +6893,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 = { @@ -6905,7 +6904,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'), @@ -6975,7 +6974,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}") @@ -6984,10 +6983,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 = { @@ -7067,7 +7066,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}") @@ -7076,10 +7075,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 = { @@ -7164,7 +7163,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}") @@ -7173,10 +7172,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 = { @@ -7184,7 +7183,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'), @@ -7258,7 +7257,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}") @@ -7267,10 +7266,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 = { @@ -7353,7 +7352,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}") @@ -7363,10 +7362,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 = { @@ -7445,7 +7444,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}") @@ -7455,10 +7454,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 = { @@ -7534,7 +7533,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}") @@ -7543,10 +7542,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 = { @@ -7622,7 +7621,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}") @@ -7631,10 +7630,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 = { @@ -7713,7 +7712,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}") @@ -7722,16 +7721,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", @@ -7811,7 +7810,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}") @@ -7821,10 +7820,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 = { @@ -7900,7 +7899,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}") @@ -7909,10 +7908,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 = { @@ -7988,7 +7987,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}") @@ -7997,10 +7996,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 = { @@ -8077,7 +8076,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}") @@ -8086,10 +8085,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 = { @@ -8165,7 +8164,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}") @@ -8174,10 +8173,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 = { @@ -8253,7 +8252,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}") @@ -8262,10 +8261,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 = { @@ -8341,7 +8340,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}") @@ -8350,10 +8349,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 = { @@ -8430,7 +8429,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}") @@ -8439,10 +8438,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 = { @@ -8519,7 +8518,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}") @@ -8528,10 +8527,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 = { @@ -8626,7 +8625,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}") @@ -8637,7 +8636,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'), @@ -8720,7 +8719,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}") @@ -8728,14 +8727,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'), @@ -8808,7 +8807,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}") @@ -8817,10 +8816,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 = { @@ -8897,7 +8896,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}") @@ -8906,10 +8905,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 = { @@ -8991,7 +8990,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}") @@ -8999,7 +8998,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", @@ -9096,7 +9095,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}") @@ -9112,7 +9111,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", @@ -9196,7 +9195,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}") @@ -9205,7 +9204,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", @@ -9361,7 +9360,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}") @@ -9405,7 +9404,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", @@ -9495,7 +9494,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}") @@ -9505,7 +9504,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", @@ -9581,7 +9580,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}") @@ -9590,10 +9589,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 = { @@ -9716,7 +9715,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}") @@ -9725,10 +9724,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: @@ -9760,14 +9759,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'), @@ -9910,7 +9909,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}") @@ -9951,14 +9950,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'), @@ -10074,7 +10073,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}") @@ -10109,7 +10108,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", @@ -10191,7 +10190,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}") @@ -10200,7 +10199,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", @@ -10321,7 +10320,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}") @@ -10356,7 +10355,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", @@ -10455,7 +10454,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}") @@ -10464,10 +10463,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: @@ -10482,14 +10481,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'), @@ -10585,7 +10584,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}") @@ -10594,10 +10593,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: @@ -10612,14 +10611,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'), @@ -10712,7 +10711,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}") @@ -10723,14 +10722,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'), @@ -10826,7 +10825,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}") @@ -10835,10 +10834,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: @@ -10854,7 +10853,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", @@ -10986,7 +10985,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}") @@ -11022,7 +11021,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", @@ -11113,7 +11112,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}") @@ -11122,17 +11121,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", @@ -11242,7 +11241,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}") @@ -11251,10 +11250,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: @@ -11277,7 +11276,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", @@ -11400,7 +11399,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}") @@ -11435,7 +11434,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", @@ -11528,7 +11527,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}") @@ -11537,10 +11536,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: @@ -11555,7 +11554,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", @@ -11680,7 +11679,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}") @@ -11715,7 +11714,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", @@ -11790,7 +11789,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}") @@ -11799,10 +11798,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 = { @@ -11875,7 +11874,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}") @@ -11952,7 +11951,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}") @@ -11961,10 +11960,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 = { @@ -12052,7 +12051,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}") @@ -12062,7 +12061,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", @@ -12140,7 +12139,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}") @@ -12149,10 +12148,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 = { @@ -12255,7 +12254,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}") @@ -12275,7 +12274,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", @@ -12373,7 +12372,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}") @@ -12392,7 +12391,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", @@ -12479,7 +12478,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}") @@ -12488,17 +12487,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", @@ -12587,7 +12586,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}") @@ -12596,17 +12595,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", @@ -12699,7 +12698,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}") @@ -12710,7 +12709,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", @@ -12803,7 +12802,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}") @@ -12812,10 +12811,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: @@ -12830,7 +12829,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", @@ -12938,7 +12937,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}") @@ -12950,7 +12949,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", @@ -13079,7 +13078,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}") @@ -13116,7 +13115,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", @@ -13207,7 +13206,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}") @@ -13218,7 +13217,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", @@ -13328,7 +13327,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}") @@ -13337,10 +13336,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 = { @@ -13350,7 +13349,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'), @@ -13436,7 +13435,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}") @@ -13445,10 +13444,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 = { @@ -13457,7 +13456,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'), @@ -13553,7 +13552,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}") @@ -13562,10 +13561,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 = { @@ -13575,7 +13574,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'), @@ -13674,7 +13673,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}") @@ -13683,10 +13682,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 = { @@ -13696,7 +13695,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'), @@ -13779,7 +13778,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}") @@ -13788,10 +13787,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 = { @@ -13799,7 +13798,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'), @@ -13867,7 +13866,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}") @@ -13876,10 +13875,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 = { @@ -13971,7 +13970,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}") @@ -13981,10 +13980,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 = { @@ -13992,7 +13991,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'), @@ -14077,7 +14076,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}") @@ -14086,10 +14085,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 = { @@ -14097,7 +14096,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'), @@ -14182,7 +14181,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}") @@ -14191,10 +14190,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 = { @@ -14202,7 +14201,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'), @@ -14290,7 +14289,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}") @@ -14300,10 +14299,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 = { @@ -14311,7 +14310,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'), @@ -14404,7 +14403,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}") @@ -14413,10 +14412,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 = { @@ -14425,7 +14424,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'), @@ -14508,7 +14507,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}") @@ -14517,10 +14516,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 = { @@ -14528,7 +14527,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'), @@ -14613,7 +14612,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}") @@ -14622,10 +14621,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 = { @@ -14633,7 +14632,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'), @@ -14722,7 +14721,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}") @@ -14731,10 +14730,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 = { @@ -14742,7 +14741,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'), @@ -14834,7 +14833,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}") @@ -14844,10 +14843,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 = { @@ -14855,7 +14854,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'), @@ -14940,7 +14939,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}") @@ -14949,10 +14948,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 = { @@ -14960,7 +14959,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'), @@ -15048,7 +15047,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}") @@ -15058,10 +15057,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 = { @@ -15069,7 +15068,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'), @@ -15156,7 +15155,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}") @@ -15165,10 +15164,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 = { @@ -15176,7 +15175,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'), @@ -15264,7 +15263,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}") @@ -15274,10 +15273,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 = { @@ -15285,7 +15284,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'), @@ -15375,7 +15374,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}") @@ -15385,10 +15384,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 = { @@ -15396,7 +15395,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'), @@ -15497,7 +15496,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}") @@ -15507,23 +15506,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'), @@ -15624,7 +15623,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}") @@ -15633,16 +15632,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", @@ -15650,7 +15649,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'), @@ -15745,7 +15744,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}") @@ -15754,16 +15753,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", @@ -15855,7 +15854,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}") @@ -15864,10 +15863,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 = { @@ -15875,7 +15874,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'), @@ -15960,7 +15959,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}") @@ -15969,10 +15968,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 = { @@ -15980,7 +15979,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'), @@ -16065,7 +16064,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}") @@ -16074,10 +16073,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 = { @@ -16085,7 +16084,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'), @@ -16186,7 +16185,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}") @@ -16195,10 +16194,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 = { @@ -16206,7 +16205,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 82d801d829..0365109ea9 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 @@ -152,7 +151,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}") @@ -239,7 +238,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}") @@ -249,7 +248,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 fdcb980249..425f921f2d 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 @@ -191,7 +190,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}") @@ -208,7 +207,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", @@ -217,7 +216,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'), @@ -327,7 +326,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}") @@ -344,7 +343,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", @@ -353,7 +352,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'), @@ -463,7 +462,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}") @@ -480,7 +479,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", @@ -489,7 +488,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'), @@ -599,7 +598,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}") @@ -616,7 +615,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", @@ -625,7 +624,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'), @@ -735,7 +734,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}") @@ -752,7 +751,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", @@ -761,7 +760,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'), @@ -871,7 +870,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}") @@ -888,7 +887,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", @@ -897,7 +896,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'), @@ -1007,7 +1006,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}") @@ -1024,7 +1023,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", @@ -1033,7 +1032,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'), @@ -1133,7 +1132,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}") @@ -1145,7 +1144,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'), @@ -1253,7 +1252,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}") @@ -1270,7 +1269,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", @@ -1279,7 +1278,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'), @@ -1389,7 +1388,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}") @@ -1406,7 +1405,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", @@ -1415,7 +1414,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'), @@ -1525,7 +1524,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}") @@ -1542,7 +1541,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", @@ -1551,7 +1550,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'), @@ -1663,7 +1662,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}") @@ -1680,7 +1679,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", @@ -1689,7 +1688,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'), @@ -1799,7 +1798,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}") @@ -1816,7 +1815,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", @@ -1825,7 +1824,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'), @@ -1935,7 +1934,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}") @@ -1952,7 +1951,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", @@ -1961,7 +1960,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'), @@ -2071,7 +2070,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}") @@ -2088,7 +2087,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", @@ -2097,7 +2096,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'), @@ -2207,7 +2206,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}") @@ -2224,7 +2223,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", @@ -2233,7 +2232,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'), @@ -2345,7 +2344,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}") @@ -2362,7 +2361,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", @@ -2371,7 +2370,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'), @@ -2481,7 +2480,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}") @@ -2498,7 +2497,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", @@ -2507,7 +2506,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'), @@ -2617,7 +2616,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}") @@ -2634,7 +2633,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", @@ -2643,7 +2642,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'), @@ -2743,7 +2742,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}") @@ -2755,7 +2754,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'), @@ -2853,7 +2852,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}") @@ -2865,7 +2864,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'), @@ -2963,7 +2962,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}") @@ -2975,7 +2974,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'), @@ -3073,7 +3072,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}") @@ -3085,7 +3084,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'), @@ -3183,7 +3182,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}") @@ -3195,7 +3194,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'), @@ -3293,7 +3292,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}") @@ -3305,7 +3304,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'), @@ -3403,7 +3402,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}") @@ -3415,7 +3414,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'), @@ -3523,7 +3522,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}") @@ -3540,7 +3539,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", @@ -3549,7 +3548,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'), @@ -3649,7 +3648,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}") @@ -3661,7 +3660,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'), @@ -3759,7 +3758,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}") @@ -3771,7 +3770,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'), @@ -3869,7 +3868,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}") @@ -3881,7 +3880,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'), @@ -3989,7 +3988,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}") @@ -4006,7 +4005,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", @@ -4015,7 +4014,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'), @@ -4125,7 +4124,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}") @@ -4142,7 +4141,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", @@ -4151,7 +4150,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'), @@ -4251,7 +4250,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}") @@ -4263,7 +4262,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'), @@ -4361,7 +4360,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}") @@ -4373,7 +4372,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'), @@ -4481,7 +4480,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}") @@ -4498,7 +4497,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", @@ -4507,7 +4506,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'), @@ -4619,7 +4618,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}") @@ -4636,7 +4635,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", @@ -4645,7 +4644,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'), @@ -4747,7 +4746,7 @@ def create_restore_oci_console_policy(self, **kwargs): "restore_oci_console_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_restore_oci_console_policy got unknown kwargs: {extra_kwargs!r}") @@ -4759,7 +4758,7 @@ def create_restore_oci_console_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'), @@ -4869,7 +4868,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}") @@ -4886,7 +4885,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", @@ -4895,7 +4894,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'), @@ -5005,7 +5004,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}") @@ -5022,7 +5021,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", @@ -5031,7 +5030,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'), @@ -5141,7 +5140,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}") @@ -5158,7 +5157,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", @@ -5167,7 +5166,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'), @@ -5277,7 +5276,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}") @@ -5294,7 +5293,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", @@ -5303,7 +5302,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'), @@ -5405,7 +5404,7 @@ def create_social_identity_provider(self, **kwargs): "social_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_social_identity_provider got unknown kwargs: {extra_kwargs!r}") @@ -5417,7 +5416,7 @@ def create_social_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'), @@ -5525,7 +5524,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}") @@ -5542,7 +5541,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", @@ -5551,7 +5550,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'), @@ -5661,7 +5660,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}") @@ -5678,7 +5677,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", @@ -5687,7 +5686,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'), @@ -5782,7 +5781,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}") @@ -5791,16 +5790,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", @@ -5810,7 +5809,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'), @@ -5903,7 +5902,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}") @@ -5912,16 +5911,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", @@ -5931,7 +5930,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'), @@ -6024,7 +6023,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}") @@ -6033,16 +6032,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", @@ -6052,7 +6051,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'), @@ -6145,7 +6144,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}") @@ -6154,16 +6153,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", @@ -6173,7 +6172,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'), @@ -6266,7 +6265,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}") @@ -6275,16 +6274,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", @@ -6294,7 +6293,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'), @@ -6387,7 +6386,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}") @@ -6396,16 +6395,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", @@ -6415,7 +6414,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'), @@ -6508,7 +6507,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}") @@ -6517,16 +6516,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", @@ -6536,7 +6535,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'), @@ -6629,7 +6628,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}") @@ -6638,16 +6637,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", @@ -6657,7 +6656,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'), @@ -6750,7 +6749,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}") @@ -6759,16 +6758,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", @@ -6778,7 +6777,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'), @@ -6871,7 +6870,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}") @@ -6880,16 +6879,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", @@ -6899,7 +6898,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'), @@ -6992,7 +6991,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}") @@ -7001,16 +7000,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", @@ -7020,7 +7019,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'), @@ -7113,7 +7112,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}") @@ -7122,16 +7121,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", @@ -7141,7 +7140,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'), @@ -7234,7 +7233,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}") @@ -7243,16 +7242,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", @@ -7262,7 +7261,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'), @@ -7355,7 +7354,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}") @@ -7364,16 +7363,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", @@ -7383,7 +7382,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'), @@ -7476,7 +7475,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}") @@ -7485,16 +7484,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", @@ -7504,7 +7503,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'), @@ -7597,7 +7596,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}") @@ -7606,16 +7605,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", @@ -7625,7 +7624,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'), @@ -7718,7 +7717,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}") @@ -7727,16 +7726,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", @@ -7746,7 +7745,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'), @@ -7839,7 +7838,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}") @@ -7848,16 +7847,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", @@ -7867,7 +7866,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'), @@ -7960,7 +7959,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}") @@ -7969,16 +7968,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", @@ -7988,7 +7987,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'), @@ -8081,7 +8080,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}") @@ -8090,16 +8089,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", @@ -8109,7 +8108,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'), @@ -8202,7 +8201,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}") @@ -8211,16 +8210,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", @@ -8230,7 +8229,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'), @@ -8323,7 +8322,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}") @@ -8332,16 +8331,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", @@ -8351,7 +8350,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'), @@ -8444,7 +8443,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}") @@ -8453,16 +8452,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", @@ -8472,7 +8471,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'), @@ -8565,7 +8564,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}") @@ -8574,16 +8573,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", @@ -8593,7 +8592,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'), @@ -8686,7 +8685,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}") @@ -8695,16 +8694,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", @@ -8714,7 +8713,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'), @@ -8807,7 +8806,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}") @@ -8816,16 +8815,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", @@ -8835,7 +8834,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'), @@ -8928,7 +8927,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}") @@ -8937,16 +8936,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", @@ -8956,7 +8955,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'), @@ -9049,7 +9048,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}") @@ -9058,16 +9057,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", @@ -9077,7 +9076,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'), @@ -9170,7 +9169,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}") @@ -9179,16 +9178,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", @@ -9198,7 +9197,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'), @@ -9291,7 +9290,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}") @@ -9300,16 +9299,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", @@ -9319,7 +9318,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'), @@ -9412,7 +9411,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}") @@ -9421,16 +9420,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", @@ -9440,7 +9439,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'), @@ -9533,7 +9532,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}") @@ -9542,16 +9541,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", @@ -9561,7 +9560,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'), @@ -9654,7 +9653,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}") @@ -9663,16 +9662,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", @@ -9682,7 +9681,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'), @@ -9775,7 +9774,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}") @@ -9784,16 +9783,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", @@ -9803,7 +9802,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'), @@ -9896,7 +9895,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}") @@ -9905,16 +9904,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", @@ -9924,7 +9923,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'), @@ -10017,7 +10016,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}") @@ -10026,16 +10025,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", @@ -10045,7 +10044,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'), @@ -10138,7 +10137,7 @@ def delete_social_identity_provider(self, social_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_social_identity_provider got unknown kwargs: {extra_kwargs!r}") @@ -10147,16 +10146,16 @@ def delete_social_identity_provider(self, social_identity_provider_id, **kwargs) "socialIdentityProviderId": social_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", @@ -10166,7 +10165,7 @@ def delete_social_identity_provider(self, social_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'), @@ -10259,7 +10258,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}") @@ -10268,16 +10267,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", @@ -10287,7 +10286,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'), @@ -10380,7 +10379,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}") @@ -10389,16 +10388,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", @@ -10408,7 +10407,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'), @@ -10503,7 +10502,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}") @@ -10512,10 +10511,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: @@ -10530,7 +10529,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", @@ -10539,7 +10538,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'), @@ -10636,7 +10635,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}") @@ -10645,10 +10644,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: @@ -10663,7 +10662,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", @@ -10672,7 +10671,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'), @@ -10769,7 +10768,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}") @@ -10778,10 +10777,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: @@ -10796,7 +10795,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", @@ -10805,7 +10804,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'), @@ -10902,7 +10901,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}") @@ -10911,10 +10910,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: @@ -10929,7 +10928,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", @@ -10938,7 +10937,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'), @@ -11035,7 +11034,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}") @@ -11044,10 +11043,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: @@ -11062,7 +11061,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", @@ -11071,7 +11070,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'), @@ -11168,7 +11167,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}") @@ -11177,10 +11176,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: @@ -11195,7 +11194,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", @@ -11204,7 +11203,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'), @@ -11301,7 +11300,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}") @@ -11310,10 +11309,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: @@ -11328,7 +11327,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", @@ -11337,7 +11336,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'), @@ -11434,7 +11433,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}") @@ -11443,10 +11442,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: @@ -11461,7 +11460,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", @@ -11470,7 +11469,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'), @@ -11567,7 +11566,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}") @@ -11576,10 +11575,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: @@ -11594,7 +11593,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", @@ -11603,7 +11602,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'), @@ -11700,7 +11699,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}") @@ -11709,10 +11708,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: @@ -11727,7 +11726,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", @@ -11736,7 +11735,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'), @@ -11833,7 +11832,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}") @@ -11842,10 +11841,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: @@ -11860,7 +11859,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", @@ -11869,7 +11868,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'), @@ -11966,7 +11965,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}") @@ -11975,10 +11974,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: @@ -11993,7 +11992,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", @@ -12002,7 +12001,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'), @@ -12099,7 +12098,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}") @@ -12108,10 +12107,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: @@ -12126,7 +12125,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", @@ -12135,7 +12134,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'), @@ -12232,7 +12231,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}") @@ -12241,10 +12240,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: @@ -12259,7 +12258,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", @@ -12268,7 +12267,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'), @@ -12365,7 +12364,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}") @@ -12374,10 +12373,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: @@ -12392,7 +12391,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", @@ -12401,7 +12400,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'), @@ -12498,7 +12497,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}") @@ -12507,10 +12506,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: @@ -12525,7 +12524,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", @@ -12534,7 +12533,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'), @@ -12631,7 +12630,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}") @@ -12640,10 +12639,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: @@ -12658,7 +12657,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", @@ -12667,7 +12666,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'), @@ -12764,7 +12763,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}") @@ -12773,10 +12772,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: @@ -12791,7 +12790,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", @@ -12800,7 +12799,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'), @@ -12897,7 +12896,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}") @@ -12906,10 +12905,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: @@ -12924,7 +12923,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", @@ -12933,7 +12932,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'), @@ -13030,7 +13029,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}") @@ -13039,10 +13038,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: @@ -13057,7 +13056,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", @@ -13066,7 +13065,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'), @@ -13163,7 +13162,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}") @@ -13172,10 +13171,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: @@ -13190,7 +13189,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", @@ -13199,7 +13198,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'), @@ -13296,7 +13295,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}") @@ -13305,10 +13304,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: @@ -13323,7 +13322,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", @@ -13332,7 +13331,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'), @@ -13429,7 +13428,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}") @@ -13438,10 +13437,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: @@ -13456,7 +13455,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", @@ -13465,7 +13464,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'), @@ -13559,7 +13558,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}") @@ -13576,7 +13575,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", @@ -13585,7 +13584,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'), @@ -13670,7 +13669,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}") @@ -13679,10 +13678,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 = { @@ -13692,7 +13691,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'), @@ -13777,7 +13776,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}") @@ -13786,10 +13785,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 = { @@ -13799,7 +13798,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'), @@ -13884,7 +13883,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}") @@ -13893,10 +13892,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 = { @@ -13906,7 +13905,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'), @@ -13991,7 +13990,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}") @@ -14000,10 +13999,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 = { @@ -14013,7 +14012,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'), @@ -14108,7 +14107,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}") @@ -14117,10 +14116,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: @@ -14135,7 +14134,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", @@ -14144,7 +14143,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'), @@ -14231,7 +14230,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}") @@ -14240,10 +14239,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 = { @@ -14253,7 +14252,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'), @@ -14338,7 +14337,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}") @@ -14347,10 +14346,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 = { @@ -14360,7 +14359,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'), @@ -14455,7 +14454,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}") @@ -14464,10 +14463,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: @@ -14482,7 +14481,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", @@ -14491,7 +14490,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'), @@ -14578,7 +14577,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}") @@ -14587,10 +14586,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 = { @@ -14600,7 +14599,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'), @@ -14685,7 +14684,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}") @@ -14694,10 +14693,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 = { @@ -14707,7 +14706,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'), @@ -14802,7 +14801,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}") @@ -14811,10 +14810,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: @@ -14829,7 +14828,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", @@ -14838,7 +14837,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'), @@ -14925,7 +14924,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}") @@ -14934,10 +14933,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 = { @@ -14947,7 +14946,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'), @@ -15042,7 +15041,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}") @@ -15051,10 +15050,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: @@ -15069,7 +15068,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", @@ -15078,7 +15077,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'), @@ -15175,7 +15174,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}") @@ -15184,10 +15183,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: @@ -15202,7 +15201,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", @@ -15211,7 +15210,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'), @@ -15308,7 +15307,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}") @@ -15317,10 +15316,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: @@ -15335,7 +15334,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", @@ -15344,7 +15343,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'), @@ -15431,7 +15430,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}") @@ -15440,10 +15439,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 = { @@ -15453,7 +15452,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'), @@ -15538,7 +15537,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}") @@ -15547,10 +15546,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 = { @@ -15560,7 +15559,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'), @@ -15655,7 +15654,7 @@ def get_oci_console_sign_on_policy_consent(self, oci_console_sign_on_policy_cons "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_oci_console_sign_on_policy_consent got unknown kwargs: {extra_kwargs!r}") @@ -15664,10 +15663,10 @@ def get_oci_console_sign_on_policy_consent(self, oci_console_sign_on_policy_cons "ociConsoleSignOnPolicyConsentId": oci_console_sign_on_policy_consent_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v 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: @@ -15682,7 +15681,7 @@ def get_oci_console_sign_on_policy_consent(self, oci_console_sign_on_policy_cons "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", @@ -15691,7 +15690,7 @@ def get_oci_console_sign_on_policy_consent(self, oci_console_sign_on_policy_cons "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'), @@ -15788,7 +15787,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}") @@ -15797,10 +15796,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: @@ -15815,7 +15814,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", @@ -15824,7 +15823,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'), @@ -15921,7 +15920,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}") @@ -15930,10 +15929,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: @@ -15948,7 +15947,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", @@ -15957,7 +15956,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'), @@ -16054,7 +16053,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}") @@ -16063,10 +16062,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: @@ -16081,7 +16080,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", @@ -16090,7 +16089,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'), @@ -16177,7 +16176,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}") @@ -16186,10 +16185,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 = { @@ -16199,7 +16198,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'), @@ -16294,7 +16293,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}") @@ -16303,10 +16302,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: @@ -16321,7 +16320,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", @@ -16330,7 +16329,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'), @@ -16427,7 +16426,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}") @@ -16436,10 +16435,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: @@ -16454,7 +16453,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", @@ -16463,7 +16462,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'), @@ -16560,7 +16559,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}") @@ -16569,10 +16568,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: @@ -16587,7 +16586,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", @@ -16596,7 +16595,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'), @@ -16693,7 +16692,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}") @@ -16702,10 +16701,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: @@ -16720,7 +16719,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", @@ -16729,7 +16728,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'), @@ -16826,7 +16825,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}") @@ -16835,10 +16834,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: @@ -16853,7 +16852,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", @@ -16862,7 +16861,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'), @@ -16949,7 +16948,7 @@ def get_social_identity_provider(self, social_identity_provider_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_social_identity_provider got unknown kwargs: {extra_kwargs!r}") @@ -16958,10 +16957,10 @@ def get_social_identity_provider(self, social_identity_provider_id, **kwargs): "socialIdentityProviderId": social_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 = { @@ -16971,7 +16970,7 @@ def get_social_identity_provider(self, social_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'), @@ -17066,7 +17065,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}") @@ -17075,10 +17074,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: @@ -17093,7 +17092,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", @@ -17102,7 +17101,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'), @@ -17199,7 +17198,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}") @@ -17208,10 +17207,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: @@ -17226,7 +17225,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", @@ -17235,7 +17234,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'), @@ -17332,7 +17331,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}") @@ -17341,10 +17340,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: @@ -17359,7 +17358,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", @@ -17368,7 +17367,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'), @@ -17494,7 +17493,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}") @@ -17525,7 +17524,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", @@ -17534,7 +17533,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'), @@ -17634,7 +17633,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}") @@ -17653,7 +17652,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", @@ -17662,7 +17661,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'), @@ -17786,7 +17785,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}") @@ -17817,7 +17816,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", @@ -17826,7 +17825,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'), @@ -17950,7 +17949,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}") @@ -17981,7 +17980,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", @@ -17990,7 +17989,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'), @@ -18114,7 +18113,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}") @@ -18145,7 +18144,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", @@ -18154,7 +18153,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'), @@ -18278,7 +18277,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}") @@ -18309,7 +18308,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", @@ -18318,7 +18317,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'), @@ -18442,7 +18441,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}") @@ -18473,7 +18472,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", @@ -18482,7 +18481,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'), @@ -18606,7 +18605,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}") @@ -18637,7 +18636,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", @@ -18646,7 +18645,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'), @@ -18770,7 +18769,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}") @@ -18801,7 +18800,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", @@ -18810,7 +18809,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'), @@ -18910,7 +18909,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}") @@ -18929,7 +18928,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", @@ -18938,7 +18937,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'), @@ -19038,7 +19037,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}") @@ -19057,7 +19056,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", @@ -19066,7 +19065,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'), @@ -19190,7 +19189,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}") @@ -19221,7 +19220,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", @@ -19230,7 +19229,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'), @@ -19354,7 +19353,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}") @@ -19385,7 +19384,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", @@ -19394,7 +19393,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'), @@ -19518,7 +19517,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}") @@ -19549,7 +19548,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", @@ -19558,7 +19557,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'), @@ -19682,7 +19681,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}") @@ -19713,7 +19712,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", @@ -19722,7 +19721,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'), @@ -19846,7 +19845,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}") @@ -19877,7 +19876,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", @@ -19886,7 +19885,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'), @@ -20010,7 +20009,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}") @@ -20041,7 +20040,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", @@ -20050,7 +20049,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'), @@ -20174,7 +20173,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}") @@ -20205,7 +20204,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", @@ -20214,7 +20213,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'), @@ -20338,7 +20337,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}") @@ -20369,7 +20368,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", @@ -20378,7 +20377,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'), @@ -20502,7 +20501,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}") @@ -20533,7 +20532,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", @@ -20542,7 +20541,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'), @@ -20666,7 +20665,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}") @@ -20697,7 +20696,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", @@ -20706,7 +20705,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'), @@ -20806,7 +20805,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}") @@ -20825,7 +20824,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", @@ -20834,7 +20833,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'), @@ -20934,7 +20933,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}") @@ -20953,7 +20952,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", @@ -20962,7 +20961,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'), @@ -21076,7 +21075,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}") @@ -21097,7 +21096,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", @@ -21106,7 +21105,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'), @@ -21220,7 +21219,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}") @@ -21241,7 +21240,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", @@ -21250,7 +21249,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'), @@ -21364,7 +21363,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}") @@ -21385,7 +21384,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", @@ -21394,7 +21393,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'), @@ -21508,7 +21507,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}") @@ -21529,7 +21528,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", @@ -21538,7 +21537,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'), @@ -21652,7 +21651,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}") @@ -21673,7 +21672,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", @@ -21682,7 +21681,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'), @@ -21806,7 +21805,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}") @@ -21837,7 +21836,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", @@ -21846,7 +21845,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'), @@ -21970,7 +21969,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}") @@ -22001,7 +22000,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", @@ -22010,7 +22009,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'), @@ -22124,7 +22123,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}") @@ -22145,7 +22144,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", @@ -22154,7 +22153,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'), @@ -22268,7 +22267,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}") @@ -22289,7 +22288,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", @@ -22298,7 +22297,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'), @@ -22412,7 +22411,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}") @@ -22433,7 +22432,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", @@ -22442,7 +22441,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'), @@ -22566,7 +22565,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}") @@ -22597,7 +22596,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", @@ -22606,7 +22605,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'), @@ -22720,7 +22719,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}") @@ -22741,7 +22740,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", @@ -22750,7 +22749,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'), @@ -22864,7 +22863,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}") @@ -22885,7 +22884,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", @@ -22894,7 +22893,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'), @@ -23018,7 +23017,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}") @@ -23049,7 +23048,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", @@ -23058,7 +23057,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'), @@ -23172,7 +23171,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}") @@ -23193,7 +23192,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", @@ -23202,7 +23201,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'), @@ -23326,7 +23325,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}") @@ -23357,7 +23356,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", @@ -23366,7 +23365,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'), @@ -23466,7 +23465,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}") @@ -23485,7 +23484,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", @@ -23494,7 +23493,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'), @@ -23618,7 +23617,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}") @@ -23649,7 +23648,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", @@ -23658,7 +23657,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'), @@ -23772,7 +23771,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}") @@ -23793,7 +23792,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", @@ -23802,7 +23801,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'), @@ -23916,7 +23915,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}") @@ -23937,7 +23936,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", @@ -23946,7 +23945,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'), @@ -24070,7 +24069,7 @@ def list_oci_console_sign_on_policy_consents(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_oci_console_sign_on_policy_consents got unknown kwargs: {extra_kwargs!r}") @@ -24101,7 +24100,7 @@ def list_oci_console_sign_on_policy_consents(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", @@ -24110,7 +24109,7 @@ def list_oci_console_sign_on_policy_consents(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'), @@ -24234,7 +24233,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}") @@ -24265,7 +24264,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", @@ -24274,7 +24273,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'), @@ -24398,7 +24397,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}") @@ -24429,7 +24428,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", @@ -24438,7 +24437,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'), @@ -24562,7 +24561,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}") @@ -24593,7 +24592,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", @@ -24602,7 +24601,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'), @@ -24726,7 +24725,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}") @@ -24757,7 +24756,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", @@ -24766,7 +24765,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'), @@ -24876,7 +24875,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}") @@ -24896,7 +24895,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", @@ -24905,7 +24904,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'), @@ -25005,7 +25004,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}") @@ -25024,7 +25023,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", @@ -25033,7 +25032,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'), @@ -25157,7 +25156,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}") @@ -25188,7 +25187,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", @@ -25197,7 +25196,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'), @@ -25321,7 +25320,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}") @@ -25352,7 +25351,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", @@ -25361,7 +25360,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'), @@ -25461,7 +25460,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}") @@ -25480,7 +25479,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", @@ -25489,7 +25488,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'), @@ -25613,7 +25612,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}") @@ -25644,7 +25643,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", @@ -25653,7 +25652,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'), @@ -25767,7 +25766,7 @@ def list_social_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_social_identity_providers got unknown kwargs: {extra_kwargs!r}") @@ -25788,7 +25787,7 @@ def list_social_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", @@ -25797,7 +25796,7 @@ def list_social_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'), @@ -25897,7 +25896,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}") @@ -25916,7 +25915,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", @@ -25925,7 +25924,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'), @@ -26049,7 +26048,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}") @@ -26080,7 +26079,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", @@ -26089,7 +26088,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'), @@ -26213,7 +26212,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}") @@ -26244,7 +26243,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", @@ -26253,7 +26252,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'), @@ -26368,7 +26367,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}") @@ -26377,10 +26376,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: @@ -26395,7 +26394,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", @@ -26405,7 +26404,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'), @@ -26524,7 +26523,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}") @@ -26533,10 +26532,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: @@ -26551,7 +26550,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", @@ -26561,7 +26560,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'), @@ -26680,7 +26679,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}") @@ -26689,10 +26688,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: @@ -26707,7 +26706,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", @@ -26717,7 +26716,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'), @@ -26836,7 +26835,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}") @@ -26845,10 +26844,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: @@ -26863,7 +26862,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", @@ -26873,7 +26872,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'), @@ -26992,7 +26991,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}") @@ -27001,10 +27000,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: @@ -27019,7 +27018,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", @@ -27029,7 +27028,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'), @@ -27148,7 +27147,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}") @@ -27157,10 +27156,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: @@ -27175,7 +27174,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", @@ -27185,7 +27184,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'), @@ -27304,7 +27303,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}") @@ -27313,10 +27312,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: @@ -27331,7 +27330,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", @@ -27341,7 +27340,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'), @@ -27460,7 +27459,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}") @@ -27469,10 +27468,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: @@ -27487,7 +27486,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", @@ -27497,7 +27496,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'), @@ -27616,7 +27615,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}") @@ -27625,10 +27624,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: @@ -27643,7 +27642,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", @@ -27653,7 +27652,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'), @@ -27772,7 +27771,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}") @@ -27781,10 +27780,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: @@ -27799,7 +27798,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", @@ -27809,7 +27808,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'), @@ -27930,7 +27929,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}") @@ -27939,10 +27938,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: @@ -27957,7 +27956,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", @@ -27967,7 +27966,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'), @@ -28086,7 +28085,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}") @@ -28095,10 +28094,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: @@ -28113,7 +28112,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", @@ -28123,7 +28122,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'), @@ -28242,7 +28241,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}") @@ -28251,10 +28250,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: @@ -28269,7 +28268,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", @@ -28279,7 +28278,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'), @@ -28398,7 +28397,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}") @@ -28407,10 +28406,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: @@ -28425,7 +28424,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", @@ -28435,7 +28434,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'), @@ -28554,7 +28553,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}") @@ -28563,10 +28562,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: @@ -28581,7 +28580,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", @@ -28591,7 +28590,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'), @@ -28712,7 +28711,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}") @@ -28721,10 +28720,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: @@ -28739,7 +28738,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", @@ -28749,7 +28748,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'), @@ -28868,7 +28867,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}") @@ -28877,10 +28876,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: @@ -28895,7 +28894,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", @@ -28905,7 +28904,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'), @@ -29024,7 +29023,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}") @@ -29033,10 +29032,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: @@ -29051,7 +29050,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", @@ -29061,7 +29060,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'), @@ -29180,7 +29179,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}") @@ -29189,10 +29188,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: @@ -29207,7 +29206,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", @@ -29217,7 +29216,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'), @@ -29333,7 +29332,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}") @@ -29350,7 +29349,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", @@ -29360,7 +29359,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'), @@ -29467,7 +29466,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}") @@ -29476,10 +29475,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 = { @@ -29490,7 +29489,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'), @@ -29597,7 +29596,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}") @@ -29606,10 +29605,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 = { @@ -29620,7 +29619,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'), @@ -29727,7 +29726,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}") @@ -29736,10 +29735,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 = { @@ -29750,7 +29749,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'), @@ -29867,7 +29866,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}") @@ -29876,10 +29875,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: @@ -29894,7 +29893,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", @@ -29904,7 +29903,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'), @@ -30013,7 +30012,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}") @@ -30022,10 +30021,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 = { @@ -30036,7 +30035,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'), @@ -30143,7 +30142,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}") @@ -30152,10 +30151,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 = { @@ -30166,7 +30165,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'), @@ -30283,7 +30282,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}") @@ -30292,10 +30291,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: @@ -30310,7 +30309,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", @@ -30320,7 +30319,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'), @@ -30429,7 +30428,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}") @@ -30438,10 +30437,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 = { @@ -30452,7 +30451,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'), @@ -30569,7 +30568,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}") @@ -30578,10 +30577,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: @@ -30596,7 +30595,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", @@ -30606,7 +30605,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'), @@ -30725,7 +30724,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}") @@ -30734,10 +30733,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: @@ -30752,7 +30751,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", @@ -30762,7 +30761,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'), @@ -30881,7 +30880,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}") @@ -30890,10 +30889,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: @@ -30908,7 +30907,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", @@ -30918,7 +30917,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'), @@ -31039,7 +31038,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}") @@ -31048,10 +31047,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: @@ -31066,7 +31065,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", @@ -31076,7 +31075,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'), @@ -31197,7 +31196,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}") @@ -31206,10 +31205,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: @@ -31224,7 +31223,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", @@ -31234,7 +31233,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'), @@ -31343,7 +31342,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}") @@ -31352,10 +31351,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 = { @@ -31366,7 +31365,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'), @@ -31483,7 +31482,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}") @@ -31492,10 +31491,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: @@ -31510,7 +31509,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", @@ -31520,7 +31519,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'), @@ -31639,7 +31638,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}") @@ -31648,10 +31647,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: @@ -31666,7 +31665,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", @@ -31676,7 +31675,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'), @@ -31795,7 +31794,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}") @@ -31804,10 +31803,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: @@ -31822,7 +31821,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", @@ -31832,7 +31831,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'), @@ -31951,7 +31950,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}") @@ -31960,10 +31959,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: @@ -31978,7 +31977,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", @@ -31988,7 +31987,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'), @@ -32107,7 +32106,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}") @@ -32116,10 +32115,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: @@ -32134,7 +32133,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", @@ -32144,7 +32143,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'), @@ -32255,7 +32254,7 @@ def patch_social_identity_provider(self, social_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_social_identity_provider got unknown kwargs: {extra_kwargs!r}") @@ -32264,10 +32263,10 @@ def patch_social_identity_provider(self, social_identity_provider_id, **kwargs): "socialIdentityProviderId": social_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 = { @@ -32278,7 +32277,7 @@ def patch_social_identity_provider(self, social_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'), @@ -32395,7 +32394,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}") @@ -32404,10 +32403,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: @@ -32422,7 +32421,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", @@ -32432,7 +32431,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'), @@ -32551,7 +32550,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}") @@ -32560,10 +32559,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: @@ -32578,7 +32577,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", @@ -32588,7 +32587,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'), @@ -32707,7 +32706,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}") @@ -32716,10 +32715,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: @@ -32734,7 +32733,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", @@ -32744,7 +32743,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'), @@ -32863,7 +32862,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}") @@ -32872,10 +32871,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: @@ -32890,7 +32889,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", @@ -32900,7 +32899,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'), @@ -33019,7 +33018,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}") @@ -33028,10 +33027,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: @@ -33046,7 +33045,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", @@ -33056,7 +33055,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'), @@ -33175,7 +33174,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}") @@ -33184,10 +33183,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: @@ -33202,7 +33201,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", @@ -33212,7 +33211,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'), @@ -33331,7 +33330,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}") @@ -33340,10 +33339,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: @@ -33358,7 +33357,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", @@ -33368,7 +33367,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'), @@ -33487,7 +33486,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}") @@ -33496,10 +33495,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: @@ -33514,7 +33513,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", @@ -33524,7 +33523,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'), @@ -33643,7 +33642,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}") @@ -33652,10 +33651,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: @@ -33670,7 +33669,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", @@ -33680,7 +33679,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'), @@ -33799,7 +33798,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}") @@ -33808,10 +33807,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: @@ -33826,7 +33825,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", @@ -33836,7 +33835,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'), @@ -33957,7 +33956,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}") @@ -33966,10 +33965,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: @@ -33984,7 +33983,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", @@ -33994,7 +33993,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'), @@ -34113,7 +34112,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}") @@ -34122,10 +34121,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: @@ -34140,7 +34139,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", @@ -34150,7 +34149,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'), @@ -34269,7 +34268,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}") @@ -34278,10 +34277,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: @@ -34296,7 +34295,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", @@ -34306,7 +34305,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'), @@ -34427,7 +34426,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}") @@ -34436,10 +34435,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: @@ -34454,7 +34453,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", @@ -34464,7 +34463,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'), @@ -34583,7 +34582,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}") @@ -34592,10 +34591,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: @@ -34610,7 +34609,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", @@ -34620,7 +34619,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'), @@ -34739,7 +34738,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}") @@ -34748,10 +34747,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: @@ -34766,7 +34765,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", @@ -34776,7 +34775,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'), @@ -34895,7 +34894,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}") @@ -34904,10 +34903,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: @@ -34922,7 +34921,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", @@ -34932,7 +34931,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'), @@ -35048,7 +35047,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}") @@ -35065,7 +35064,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", @@ -35075,7 +35074,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'), @@ -35179,7 +35178,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}") @@ -35192,7 +35191,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'), @@ -35307,7 +35306,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}") @@ -35316,10 +35315,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: @@ -35334,7 +35333,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", @@ -35344,7 +35343,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'), @@ -35463,7 +35462,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}") @@ -35472,10 +35471,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: @@ -35490,7 +35489,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", @@ -35500,7 +35499,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'), @@ -35619,7 +35618,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}") @@ -35628,10 +35627,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: @@ -35646,7 +35645,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", @@ -35656,7 +35655,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'), @@ -35777,7 +35776,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}") @@ -35786,10 +35785,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: @@ -35804,7 +35803,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", @@ -35814,7 +35813,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'), @@ -35935,7 +35934,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}") @@ -35944,10 +35943,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: @@ -35962,7 +35961,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", @@ -35972,7 +35971,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'), @@ -36081,7 +36080,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}") @@ -36090,10 +36089,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 = { @@ -36104,7 +36103,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'), @@ -36221,7 +36220,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}") @@ -36230,10 +36229,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: @@ -36248,7 +36247,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", @@ -36258,7 +36257,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'), @@ -36377,7 +36376,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}") @@ -36386,10 +36385,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: @@ -36404,7 +36403,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", @@ -36414,7 +36413,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'), @@ -36533,7 +36532,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}") @@ -36542,10 +36541,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: @@ -36560,7 +36559,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", @@ -36570,7 +36569,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'), @@ -36681,7 +36680,7 @@ def put_social_identity_provider(self, social_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_social_identity_provider got unknown kwargs: {extra_kwargs!r}") @@ -36690,10 +36689,10 @@ def put_social_identity_provider(self, social_identity_provider_id, **kwargs): "socialIdentityProviderId": social_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 = { @@ -36704,7 +36703,7 @@ def put_social_identity_provider(self, social_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'), @@ -36821,7 +36820,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}") @@ -36830,10 +36829,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: @@ -36848,7 +36847,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", @@ -36858,7 +36857,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'), @@ -36967,7 +36966,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}") @@ -36976,10 +36975,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 = { @@ -36990,7 +36989,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'), @@ -37097,7 +37096,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}") @@ -37106,10 +37105,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 = { @@ -37120,7 +37119,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'), @@ -37227,7 +37226,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}") @@ -37236,10 +37235,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 = { @@ -37250,7 +37249,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'), @@ -37367,7 +37366,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}") @@ -37376,10 +37375,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: @@ -37394,7 +37393,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", @@ -37404,7 +37403,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'), @@ -37502,7 +37501,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}") @@ -37511,7 +37510,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", @@ -37520,7 +37519,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'), @@ -37616,7 +37615,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}") @@ -37625,7 +37624,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", @@ -37634,7 +37633,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'), @@ -37730,7 +37729,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}") @@ -37739,7 +37738,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", @@ -37748,7 +37747,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'), @@ -37844,7 +37843,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}") @@ -37853,7 +37852,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", @@ -37862,7 +37861,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'), @@ -37958,7 +37957,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}") @@ -37967,7 +37966,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", @@ -37976,7 +37975,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'), @@ -38072,7 +38071,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}") @@ -38081,7 +38080,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", @@ -38090,7 +38089,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'), @@ -38186,7 +38185,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}") @@ -38195,7 +38194,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", @@ -38204,7 +38203,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'), @@ -38300,7 +38299,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}") @@ -38309,7 +38308,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", @@ -38318,7 +38317,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'), @@ -38414,7 +38413,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}") @@ -38423,7 +38422,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", @@ -38432,7 +38431,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'), @@ -38528,7 +38527,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}") @@ -38537,7 +38536,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", @@ -38546,7 +38545,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'), @@ -38642,7 +38641,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}") @@ -38651,7 +38650,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", @@ -38660,7 +38659,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'), @@ -38756,7 +38755,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}") @@ -38765,7 +38764,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", @@ -38774,7 +38773,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'), @@ -38870,7 +38869,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}") @@ -38879,7 +38878,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", @@ -38888,7 +38887,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'), @@ -38984,7 +38983,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}") @@ -38993,7 +38992,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", @@ -39002,7 +39001,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'), @@ -39098,7 +39097,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}") @@ -39107,7 +39106,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", @@ -39116,7 +39115,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'), @@ -39212,7 +39211,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}") @@ -39221,7 +39220,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", @@ -39230,7 +39229,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'), @@ -39326,7 +39325,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}") @@ -39335,7 +39334,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", @@ -39344,7 +39343,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'), @@ -39440,7 +39439,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}") @@ -39449,7 +39448,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", @@ -39458,7 +39457,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'), @@ -39554,7 +39553,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}") @@ -39563,7 +39562,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", @@ -39572,7 +39571,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'), @@ -39668,7 +39667,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}") @@ -39677,7 +39676,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", @@ -39686,7 +39685,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'), @@ -39782,7 +39781,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}") @@ -39791,7 +39790,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", @@ -39800,7 +39799,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'), @@ -39896,7 +39895,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}") @@ -39905,7 +39904,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", @@ -39914,7 +39913,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'), @@ -40010,7 +40009,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}") @@ -40019,7 +40018,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", @@ -40028,7 +40027,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'), @@ -40124,7 +40123,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}") @@ -40133,7 +40132,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", @@ -40142,7 +40141,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'), @@ -40238,7 +40237,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}") @@ -40247,7 +40246,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", @@ -40256,7 +40255,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'), @@ -40352,7 +40351,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}") @@ -40361,7 +40360,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", @@ -40370,7 +40369,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'), @@ -40466,7 +40465,7 @@ def search_oci_console_sign_on_policy_consents(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_oci_console_sign_on_policy_consents got unknown kwargs: {extra_kwargs!r}") @@ -40475,7 +40474,7 @@ def search_oci_console_sign_on_policy_consents(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", @@ -40484,7 +40483,7 @@ def search_oci_console_sign_on_policy_consents(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'), @@ -40580,7 +40579,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}") @@ -40589,7 +40588,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", @@ -40598,7 +40597,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'), @@ -40694,7 +40693,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}") @@ -40703,7 +40702,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", @@ -40712,7 +40711,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'), @@ -40808,7 +40807,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}") @@ -40817,7 +40816,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", @@ -40826,7 +40825,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'), @@ -40922,7 +40921,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}") @@ -40931,7 +40930,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", @@ -40940,7 +40939,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'), @@ -41036,7 +41035,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}") @@ -41045,7 +41044,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", @@ -41054,7 +41053,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'), @@ -41150,7 +41149,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}") @@ -41159,7 +41158,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", @@ -41168,7 +41167,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'), @@ -41264,7 +41263,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}") @@ -41273,7 +41272,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", @@ -41282,7 +41281,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'), @@ -41378,7 +41377,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}") @@ -41387,7 +41386,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", @@ -41396,7 +41395,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'), @@ -41492,7 +41491,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}") @@ -41501,7 +41500,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", @@ -41510,7 +41509,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'), @@ -41606,7 +41605,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}") @@ -41615,7 +41614,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", @@ -41624,7 +41623,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'), @@ -41720,7 +41719,7 @@ def search_social_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_social_identity_providers got unknown kwargs: {extra_kwargs!r}") @@ -41729,7 +41728,7 @@ def search_social_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", @@ -41738,7 +41737,7 @@ def search_social_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'), @@ -41834,7 +41833,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}") @@ -41843,7 +41842,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", @@ -41852,7 +41851,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'), @@ -41948,7 +41947,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}") @@ -41957,7 +41956,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", @@ -41966,7 +41965,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'), @@ -42062,7 +42061,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}") @@ -42071,7 +42070,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", @@ -42080,7 +42079,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 05a29ced4f..0ae755448b 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 @@ -180,7 +179,7 @@ def add_oracle_managed_custom_endpoint(self, add_oracle_managed_custom_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"add_oracle_managed_custom_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -189,10 +188,10 @@ def add_oracle_managed_custom_endpoint(self, add_oracle_managed_custom_endpoint_ "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 = { @@ -202,7 +201,7 @@ def add_oracle_managed_custom_endpoint(self, add_oracle_managed_custom_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'), @@ -301,7 +300,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}") @@ -310,10 +309,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 = { @@ -323,7 +322,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'), @@ -421,7 +420,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}") @@ -430,10 +429,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 = { @@ -443,7 +442,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'), @@ -541,7 +540,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}") @@ -550,10 +549,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 = { @@ -563,7 +562,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'), @@ -649,7 +648,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}") @@ -660,7 +659,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'), @@ -745,7 +744,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}") @@ -754,10 +753,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 = { @@ -766,7 +765,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'), @@ -860,7 +859,7 @@ def disaster_recovery_failover(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"disaster_recovery_failover got unknown kwargs: {extra_kwargs!r}") @@ -869,10 +868,10 @@ def disaster_recovery_failover(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 = { @@ -882,7 +881,7 @@ def disaster_recovery_failover(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'), @@ -976,7 +975,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}") @@ -985,10 +984,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 = { @@ -998,7 +997,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'), @@ -1093,7 +1092,7 @@ def extend_data_retention(self, integration_instance_id, extend_data_retention_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"extend_data_retention got unknown kwargs: {extra_kwargs!r}") @@ -1102,10 +1101,10 @@ def extend_data_retention(self, integration_instance_id, extend_data_retention_d "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 = { @@ -1115,7 +1114,7 @@ def extend_data_retention(self, integration_instance_id, extend_data_retention_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'), @@ -1194,7 +1193,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}") @@ -1203,10 +1202,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 = { @@ -1214,7 +1213,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'), @@ -1290,7 +1289,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}") @@ -1299,10 +1298,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 = { @@ -1310,7 +1309,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'), @@ -1420,7 +1419,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}") @@ -1455,14 +1454,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'), @@ -1549,7 +1548,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}") @@ -1558,10 +1557,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 = { @@ -1569,14 +1568,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'), @@ -1665,7 +1664,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}") @@ -1674,10 +1673,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 = { @@ -1685,14 +1684,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'), @@ -1782,7 +1781,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}") @@ -1793,14 +1792,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'), @@ -1893,7 +1892,7 @@ def remove_oracle_managed_custom_endpoint(self, integration_instance_id, **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"remove_oracle_managed_custom_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1902,10 +1901,10 @@ def remove_oracle_managed_custom_endpoint(self, integration_instance_id, **kwarg "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 = { @@ -1915,7 +1914,7 @@ def remove_oracle_managed_custom_endpoint(self, integration_instance_id, **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'), @@ -2009,7 +2008,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}") @@ -2018,10 +2017,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 = { @@ -2031,7 +2030,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'), @@ -2123,7 +2122,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}") @@ -2132,10 +2131,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 = { @@ -2145,7 +2144,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'), @@ -2231,7 +2230,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}") @@ -2240,10 +2239,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 = { @@ -2252,7 +2251,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/iot/iot_client.py b/src/oci/iot/iot_client.py index ce459bceaf..9403920336 100644 --- a/src/oci/iot/iot_client.py +++ b/src/oci/iot/iot_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_iot_domain_compartment(self, iot_domain_id, change_iot_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_iot_domain_compartment got unknown kwargs: {extra_kwargs!r}") @@ -195,10 +194,10 @@ def change_iot_domain_compartment(self, iot_domain_id, change_iot_domain_compart "iotDomainId": iot_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 = { @@ -208,7 +207,7 @@ def change_iot_domain_compartment(self, iot_domain_id, change_iot_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'), @@ -309,7 +308,7 @@ def change_iot_domain_data_retention_period(self, iot_domain_id, change_iot_doma "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_iot_domain_data_retention_period got unknown kwargs: {extra_kwargs!r}") @@ -318,10 +317,10 @@ def change_iot_domain_data_retention_period(self, iot_domain_id, change_iot_doma "iotDomainId": iot_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 = { @@ -331,7 +330,7 @@ def change_iot_domain_data_retention_period(self, iot_domain_id, change_iot_doma "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 change_iot_domain_group_compartment(self, iot_domain_group_id, change_iot_do "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_iot_domain_group_compartment got unknown kwargs: {extra_kwargs!r}") @@ -444,10 +443,10 @@ def change_iot_domain_group_compartment(self, iot_domain_group_id, change_iot_do "iotDomainGroupId": iot_domain_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 = { @@ -457,7 +456,7 @@ def change_iot_domain_group_compartment(self, iot_domain_group_id, change_iot_do "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 configure_iot_domain_data_access(self, iot_domain_id, configure_iot_domain_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"configure_iot_domain_data_access got unknown kwargs: {extra_kwargs!r}") @@ -567,10 +566,10 @@ def configure_iot_domain_data_access(self, iot_domain_id, configure_iot_domain_d "iotDomainId": iot_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 = { @@ -580,7 +579,7 @@ def configure_iot_domain_data_access(self, iot_domain_id, configure_iot_domain_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'), @@ -681,7 +680,7 @@ def configure_iot_domain_group_data_access(self, iot_domain_group_id, configure_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_iot_domain_group_data_access got unknown kwargs: {extra_kwargs!r}") @@ -690,10 +689,10 @@ def configure_iot_domain_group_data_access(self, iot_domain_group_id, configure_ "iotDomainGroupId": iot_domain_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 = { @@ -703,7 +702,7 @@ def configure_iot_domain_group_data_access(self, iot_domain_group_id, configure_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 create_digital_twin_adapter(self, create_digital_twin_adapter_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_digital_twin_adapter got unknown kwargs: {extra_kwargs!r}") @@ -802,7 +801,7 @@ def create_digital_twin_adapter(self, create_digital_twin_adapter_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'), @@ -890,7 +889,7 @@ def create_digital_twin_instance(self, create_digital_twin_instance_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_digital_twin_instance got unknown kwargs: {extra_kwargs!r}") @@ -901,7 +900,7 @@ def create_digital_twin_instance(self, create_digital_twin_instance_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'), @@ -989,7 +988,7 @@ def create_digital_twin_model(self, create_digital_twin_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_digital_twin_model got unknown kwargs: {extra_kwargs!r}") @@ -1000,7 +999,7 @@ def create_digital_twin_model(self, create_digital_twin_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'), @@ -1088,7 +1087,7 @@ def create_digital_twin_relationship(self, create_digital_twin_relationship_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_digital_twin_relationship got unknown kwargs: {extra_kwargs!r}") @@ -1099,7 +1098,7 @@ def create_digital_twin_relationship(self, create_digital_twin_relationship_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'), @@ -1187,7 +1186,7 @@ def create_iot_domain(self, create_iot_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_iot_domain got unknown kwargs: {extra_kwargs!r}") @@ -1198,7 +1197,7 @@ def create_iot_domain(self, create_iot_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'), @@ -1286,7 +1285,7 @@ def create_iot_domain_group(self, create_iot_domain_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_iot_domain_group got unknown kwargs: {extra_kwargs!r}") @@ -1297,7 +1296,7 @@ def create_iot_domain_group(self, create_iot_domain_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'), @@ -1387,7 +1386,7 @@ def delete_digital_twin_adapter(self, digital_twin_adapter_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_twin_adapter got unknown kwargs: {extra_kwargs!r}") @@ -1396,10 +1395,10 @@ def delete_digital_twin_adapter(self, digital_twin_adapter_id, **kwargs): "digitalTwinAdapterId": digital_twin_adapter_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1408,7 +1407,7 @@ def delete_digital_twin_adapter(self, digital_twin_adapter_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 delete_digital_twin_instance(self, digital_twin_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_digital_twin_instance got unknown kwargs: {extra_kwargs!r}") @@ -1504,10 +1503,10 @@ def delete_digital_twin_instance(self, digital_twin_instance_id, **kwargs): "digitalTwinInstanceId": digital_twin_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 = { @@ -1516,7 +1515,7 @@ def delete_digital_twin_instance(self, digital_twin_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'), @@ -1603,7 +1602,7 @@ def delete_digital_twin_model(self, digital_twin_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_digital_twin_model got unknown kwargs: {extra_kwargs!r}") @@ -1612,10 +1611,10 @@ def delete_digital_twin_model(self, digital_twin_model_id, **kwargs): "digitalTwinModelId": digital_twin_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 = { @@ -1624,7 +1623,7 @@ def delete_digital_twin_model(self, digital_twin_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'), @@ -1711,7 +1710,7 @@ def delete_digital_twin_relationship(self, digital_twin_relationship_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_digital_twin_relationship got unknown kwargs: {extra_kwargs!r}") @@ -1720,10 +1719,10 @@ def delete_digital_twin_relationship(self, digital_twin_relationship_id, **kwarg "digitalTwinRelationshipId": digital_twin_relationship_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1732,7 +1731,7 @@ def delete_digital_twin_relationship(self, digital_twin_relationship_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'), @@ -1819,7 +1818,7 @@ def delete_iot_domain(self, iot_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_iot_domain got unknown kwargs: {extra_kwargs!r}") @@ -1828,10 +1827,10 @@ def delete_iot_domain(self, iot_domain_id, **kwargs): "iotDomainId": iot_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 = { @@ -1840,7 +1839,7 @@ def delete_iot_domain(self, iot_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'), @@ -1927,7 +1926,7 @@ def delete_iot_domain_group(self, iot_domain_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_iot_domain_group got unknown kwargs: {extra_kwargs!r}") @@ -1936,10 +1935,10 @@ def delete_iot_domain_group(self, iot_domain_group_id, **kwargs): "iotDomainGroupId": iot_domain_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 = { @@ -1948,7 +1947,7 @@ def delete_iot_domain_group(self, iot_domain_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'), @@ -2027,7 +2026,7 @@ def get_digital_twin_adapter(self, digital_twin_adapter_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_twin_adapter got unknown kwargs: {extra_kwargs!r}") @@ -2036,10 +2035,10 @@ def get_digital_twin_adapter(self, digital_twin_adapter_id, **kwargs): "digitalTwinAdapterId": digital_twin_adapter_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2047,7 +2046,7 @@ def get_digital_twin_adapter(self, digital_twin_adapter_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 get_digital_twin_instance(self, digital_twin_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_digital_twin_instance got unknown kwargs: {extra_kwargs!r}") @@ -2137,10 +2136,10 @@ def get_digital_twin_instance(self, digital_twin_instance_id, **kwargs): "digitalTwinInstanceId": digital_twin_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 = { @@ -2148,7 +2147,7 @@ def get_digital_twin_instance(self, digital_twin_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'), @@ -2233,7 +2232,7 @@ def get_digital_twin_instance_content(self, digital_twin_instance_id, **kwargs): "opc_request_id", "should_include_metadata" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_twin_instance_content got unknown kwargs: {extra_kwargs!r}") @@ -2242,23 +2241,23 @@ def get_digital_twin_instance_content(self, digital_twin_instance_id, **kwargs): "digitalTwinInstanceId": digital_twin_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 = { "shouldIncludeMetadata": kwargs.get("should_include_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, application/ld+json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2341,7 +2340,7 @@ def get_digital_twin_model(self, digital_twin_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_digital_twin_model got unknown kwargs: {extra_kwargs!r}") @@ -2350,10 +2349,10 @@ def get_digital_twin_model(self, digital_twin_model_id, **kwargs): "digitalTwinModelId": digital_twin_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 = { @@ -2361,7 +2360,7 @@ def get_digital_twin_model(self, digital_twin_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'), @@ -2442,7 +2441,7 @@ def get_digital_twin_model_spec(self, digital_twin_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_digital_twin_model_spec got unknown kwargs: {extra_kwargs!r}") @@ -2451,10 +2450,10 @@ def get_digital_twin_model_spec(self, digital_twin_model_id, **kwargs): "digitalTwinModelId": digital_twin_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 = { @@ -2462,7 +2461,7 @@ def get_digital_twin_model_spec(self, digital_twin_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'), @@ -2543,7 +2542,7 @@ def get_digital_twin_relationship(self, digital_twin_relationship_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_twin_relationship got unknown kwargs: {extra_kwargs!r}") @@ -2552,10 +2551,10 @@ def get_digital_twin_relationship(self, digital_twin_relationship_id, **kwargs): "digitalTwinRelationshipId": digital_twin_relationship_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -2563,7 +2562,7 @@ def get_digital_twin_relationship(self, digital_twin_relationship_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2644,7 +2643,7 @@ def get_iot_domain(self, iot_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_iot_domain got unknown kwargs: {extra_kwargs!r}") @@ -2653,10 +2652,10 @@ def get_iot_domain(self, iot_domain_id, **kwargs): "iotDomainId": iot_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 = { @@ -2664,7 +2663,7 @@ def get_iot_domain(self, iot_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'), @@ -2745,7 +2744,7 @@ def get_iot_domain_group(self, iot_domain_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_iot_domain_group got unknown kwargs: {extra_kwargs!r}") @@ -2754,10 +2753,10 @@ def get_iot_domain_group(self, iot_domain_group_id, **kwargs): "iotDomainGroupId": iot_domain_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 = { @@ -2765,7 +2764,7 @@ def get_iot_domain_group(self, iot_domain_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'), @@ -2846,7 +2845,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}") @@ -2855,10 +2854,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 = { @@ -2866,7 +2865,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'), @@ -2958,7 +2957,7 @@ def invoke_raw_command(self, digital_twin_instance_id, invoke_raw_command_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"invoke_raw_command got unknown kwargs: {extra_kwargs!r}") @@ -2967,10 +2966,10 @@ def invoke_raw_command(self, digital_twin_instance_id, invoke_raw_command_detail "digitalTwinInstanceId": digital_twin_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 = { @@ -2979,7 +2978,7 @@ def invoke_raw_command(self, digital_twin_instance_id, invoke_raw_command_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'), @@ -3112,7 +3111,7 @@ def list_digital_twin_adapters(self, iot_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_digital_twin_adapters got unknown kwargs: {extra_kwargs!r}") @@ -3150,14 +3149,14 @@ def list_digital_twin_adapters(self, iot_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'), @@ -3289,7 +3288,7 @@ def list_digital_twin_instances(self, iot_domain_id, **kwargs): "digital_twin_model_spec_uri", "id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_twin_instances got unknown kwargs: {extra_kwargs!r}") @@ -3327,14 +3326,14 @@ def list_digital_twin_instances(self, iot_domain_id, **kwargs): "iotDomainId": iot_domain_id, "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'), @@ -3460,7 +3459,7 @@ def list_digital_twin_models(self, iot_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_digital_twin_models got unknown kwargs: {extra_kwargs!r}") @@ -3497,14 +3496,14 @@ def list_digital_twin_models(self, iot_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'), @@ -3642,7 +3641,7 @@ def list_digital_twin_relationships(self, iot_domain_id, **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_digital_twin_relationships got unknown kwargs: {extra_kwargs!r}") @@ -3681,14 +3680,14 @@ def list_digital_twin_relationships(self, iot_domain_id, **kwargs): "iotDomainId": iot_domain_id, "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'), @@ -3814,7 +3813,7 @@ def list_iot_domain_groups(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_iot_domain_groups got unknown kwargs: {extra_kwargs!r}") @@ -3850,14 +3849,14 @@ def list_iot_domain_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'), @@ -3989,7 +3988,7 @@ def list_iot_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_iot_domains got unknown kwargs: {extra_kwargs!r}") @@ -4026,14 +4025,14 @@ def list_iot_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'), @@ -4142,7 +4141,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}") @@ -4151,10 +4150,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: @@ -4177,14 +4176,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'), @@ -4295,7 +4294,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}") @@ -4304,10 +4303,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: @@ -4330,14 +4329,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'), @@ -4466,7 +4465,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}") @@ -4502,14 +4501,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'), @@ -4601,7 +4600,7 @@ def update_digital_twin_adapter(self, digital_twin_adapter_id, update_digital_tw "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_twin_adapter got unknown kwargs: {extra_kwargs!r}") @@ -4610,10 +4609,10 @@ def update_digital_twin_adapter(self, digital_twin_adapter_id, update_digital_tw "digitalTwinAdapterId": digital_twin_adapter_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4622,7 +4621,7 @@ def update_digital_twin_adapter(self, digital_twin_adapter_id, update_digital_tw "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4716,7 +4715,7 @@ def update_digital_twin_instance(self, digital_twin_instance_id, update_digital_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_twin_instance got unknown kwargs: {extra_kwargs!r}") @@ -4725,10 +4724,10 @@ def update_digital_twin_instance(self, digital_twin_instance_id, update_digital_ "digitalTwinInstanceId": digital_twin_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 = { @@ -4737,7 +4736,7 @@ def update_digital_twin_instance(self, digital_twin_instance_id, update_digital_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4831,7 +4830,7 @@ def update_digital_twin_model(self, digital_twin_model_id, update_digital_twin_m "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_twin_model got unknown kwargs: {extra_kwargs!r}") @@ -4840,10 +4839,10 @@ def update_digital_twin_model(self, digital_twin_model_id, update_digital_twin_m "digitalTwinModelId": digital_twin_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 = { @@ -4852,7 +4851,7 @@ def update_digital_twin_model(self, digital_twin_model_id, update_digital_twin_m "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4946,7 +4945,7 @@ def update_digital_twin_relationship(self, digital_twin_relationship_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_twin_relationship got unknown kwargs: {extra_kwargs!r}") @@ -4955,10 +4954,10 @@ def update_digital_twin_relationship(self, digital_twin_relationship_id, update_ "digitalTwinRelationshipId": digital_twin_relationship_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4967,7 +4966,7 @@ def update_digital_twin_relationship(self, digital_twin_relationship_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'), @@ -5061,7 +5060,7 @@ def update_iot_domain(self, iot_domain_id, update_iot_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_iot_domain got unknown kwargs: {extra_kwargs!r}") @@ -5070,10 +5069,10 @@ def update_iot_domain(self, iot_domain_id, update_iot_domain_details, **kwargs): "iotDomainId": iot_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 = { @@ -5082,7 +5081,7 @@ def update_iot_domain(self, iot_domain_id, update_iot_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'), @@ -5174,7 +5173,7 @@ def update_iot_domain_group(self, iot_domain_group_id, update_iot_domain_group_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_iot_domain_group got unknown kwargs: {extra_kwargs!r}") @@ -5183,10 +5182,10 @@ def update_iot_domain_group(self, iot_domain_group_id, update_iot_domain_group_d "iotDomainGroupId": iot_domain_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 = { @@ -5195,7 +5194,7 @@ def update_iot_domain_group(self, iot_domain_group_id, update_iot_domain_group_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/jms/java_management_service_client.py b/src/oci/jms/java_management_service_client.py index a9d4d2ac0f..7841fa2c97 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 @@ -181,7 +180,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}") @@ -190,10 +189,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 = { @@ -203,7 +202,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'), @@ -292,7 +291,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}") @@ -301,10 +300,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 = { @@ -313,7 +312,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'), @@ -410,7 +409,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}") @@ -419,10 +418,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 = { @@ -432,7 +431,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'), @@ -524,7 +523,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}") @@ -533,10 +532,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 = { @@ -545,7 +544,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'), @@ -647,7 +646,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}") @@ -656,10 +655,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 = { @@ -669,7 +668,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'), @@ -764,7 +763,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}") @@ -775,7 +774,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'), @@ -862,7 +861,7 @@ def create_jms_plugin(self, create_jms_plugin_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_jms_plugin got unknown kwargs: {extra_kwargs!r}") @@ -873,7 +872,7 @@ def create_jms_plugin(self, create_jms_plugin_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'), @@ -960,7 +959,7 @@ def create_task_schedule(self, create_task_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_task_schedule got unknown kwargs: {extra_kwargs!r}") @@ -971,7 +970,7 @@ def create_task_schedule(self, create_task_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'), @@ -1063,7 +1062,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}") @@ -1073,10 +1072,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 = { @@ -1085,7 +1084,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'), @@ -1174,7 +1173,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}") @@ -1184,10 +1183,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 = { @@ -1196,7 +1195,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'), @@ -1285,7 +1284,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}") @@ -1295,10 +1294,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 = { @@ -1307,7 +1306,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'), @@ -1393,7 +1392,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}") @@ -1402,10 +1401,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 = { @@ -1414,7 +1413,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'), @@ -1503,7 +1502,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}") @@ -1513,10 +1512,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 = { @@ -1525,7 +1524,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'), @@ -1612,7 +1611,7 @@ def delete_jms_plugin(self, jms_plugin_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_jms_plugin got unknown kwargs: {extra_kwargs!r}") @@ -1621,10 +1620,10 @@ def delete_jms_plugin(self, jms_plugin_id, **kwargs): "jmsPluginId": jms_plugin_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_jms_plugin(self, jms_plugin_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'), @@ -1722,7 +1721,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}") @@ -1732,10 +1731,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 = { @@ -1744,7 +1743,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'), @@ -1834,7 +1833,7 @@ def delete_task_schedule(self, task_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_task_schedule got unknown kwargs: {extra_kwargs!r}") @@ -1843,16 +1842,16 @@ def delete_task_schedule(self, task_schedule_id, **kwargs): "taskScheduleId": task_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') query_params = { "fleetId": kwargs.get("fleet_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", @@ -1860,7 +1859,7 @@ def delete_task_schedule(self, task_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'), @@ -1959,7 +1958,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}") @@ -1968,10 +1967,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 = { @@ -1981,7 +1980,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'), @@ -2081,7 +2080,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}") @@ -2090,10 +2089,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 = { @@ -2103,7 +2102,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'), @@ -2187,7 +2186,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}") @@ -2196,10 +2195,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 = { @@ -2207,7 +2206,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'), @@ -2287,7 +2286,7 @@ def generate_agent_installer_configuration(self, generate_agent_installer_config "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_installer_configuration got unknown kwargs: {extra_kwargs!r}") @@ -2297,7 +2296,7 @@ def generate_agent_installer_configuration(self, generate_agent_installer_config "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2380,7 +2379,7 @@ def generate_load_pipeline_script(self, fleet_id, generate_load_pipeline_script_ "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_load_pipeline_script got unknown kwargs: {extra_kwargs!r}") @@ -2389,10 +2388,10 @@ def generate_load_pipeline_script(self, fleet_id, generate_load_pipeline_script_ "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 = { @@ -2400,7 +2399,7 @@ def generate_load_pipeline_script(self, fleet_id, generate_load_pipeline_script_ "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -2495,10 +2494,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 = { @@ -2506,7 +2505,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'), @@ -2593,7 +2592,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}") @@ -2603,23 +2602,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'), @@ -2701,7 +2700,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}") @@ -2710,10 +2709,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 = { @@ -2721,7 +2720,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'), @@ -2801,7 +2800,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}") @@ -2810,10 +2809,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 = { @@ -2821,7 +2820,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'), @@ -2901,7 +2900,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}") @@ -2910,10 +2909,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 = { @@ -2921,7 +2920,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'), @@ -3009,7 +3008,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}") @@ -3018,10 +3017,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 = { @@ -3030,7 +3029,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'), @@ -3110,7 +3109,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}") @@ -3119,10 +3118,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 = { @@ -3130,7 +3129,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'), @@ -3208,7 +3207,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}") @@ -3217,10 +3216,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 = { @@ -3228,7 +3227,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'), @@ -3311,7 +3310,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}") @@ -3321,10 +3320,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 = { @@ -3332,7 +3331,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'), @@ -3410,7 +3409,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}") @@ -3419,10 +3418,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 = { @@ -3430,7 +3429,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'), @@ -3510,7 +3509,7 @@ def get_jms_plugin(self, jms_plugin_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_jms_plugin got unknown kwargs: {extra_kwargs!r}") @@ -3519,10 +3518,10 @@ def get_jms_plugin(self, jms_plugin_id, **kwargs): "jmsPluginId": jms_plugin_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3530,7 +3529,7 @@ def get_jms_plugin(self, jms_plugin_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3613,7 +3612,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}") @@ -3623,10 +3622,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 = { @@ -3634,7 +3633,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'), @@ -3718,7 +3717,7 @@ def get_task_schedule(self, task_schedule_id, **kwargs): "fleet_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_task_schedule got unknown kwargs: {extra_kwargs!r}") @@ -3727,23 +3726,23 @@ def get_task_schedule(self, task_schedule_id, **kwargs): "taskScheduleId": task_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') query_params = { "fleetId": kwargs.get("fleet_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'), @@ -3825,7 +3824,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}") @@ -3834,10 +3833,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 = { @@ -3845,7 +3844,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'), @@ -3964,7 +3963,7 @@ def list_agent_installers(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_agent_installers got unknown kwargs: {extra_kwargs!r}") @@ -4007,14 +4006,14 @@ def list_agent_installers(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'), @@ -4126,7 +4125,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}") @@ -4154,14 +4153,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'), @@ -4273,7 +4272,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}") @@ -4282,10 +4281,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: @@ -4317,14 +4316,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'), @@ -4459,7 +4458,7 @@ def list_containers(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_containers got unknown kwargs: {extra_kwargs!r}") @@ -4468,10 +4467,10 @@ def list_containers(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 'jre_security_status' in kwargs: @@ -4508,14 +4507,14 @@ def list_containers(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'), @@ -4664,7 +4663,7 @@ def list_crypto_analysis_results(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_crypto_analysis_results got unknown kwargs: {extra_kwargs!r}") @@ -4673,10 +4672,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: @@ -4715,14 +4714,14 @@ def list_crypto_analysis_results(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'), @@ -4826,7 +4825,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}") @@ -4835,10 +4834,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: @@ -4861,14 +4860,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'), @@ -4958,7 +4957,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}") @@ -4967,24 +4966,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'), @@ -5113,7 +5112,7 @@ def list_fleet_errors(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_fleet_errors got unknown kwargs: {extra_kwargs!r}") @@ -5145,14 +5144,14 @@ def list_fleet_errors(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'), @@ -5276,7 +5275,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}") @@ -5313,14 +5312,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'), @@ -5475,7 +5474,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}") @@ -5484,10 +5483,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: @@ -5536,14 +5535,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'), @@ -5653,7 +5652,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}") @@ -5681,14 +5680,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'), @@ -5816,7 +5815,7 @@ def list_java_migration_analysis_results(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_java_migration_analysis_results got unknown kwargs: {extra_kwargs!r}") @@ -5825,10 +5824,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: @@ -5856,14 +5855,14 @@ def list_java_migration_analysis_results(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'), @@ -5986,7 +5985,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}") @@ -6037,14 +6036,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'), @@ -6202,7 +6201,7 @@ def list_jms_plugins(self, **kwargs): "hostname_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_jms_plugins got unknown kwargs: {extra_kwargs!r}") @@ -6259,14 +6258,14 @@ def list_jms_plugins(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "hostnameContains": kwargs.get("hostname_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'), @@ -6398,7 +6397,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}") @@ -6429,14 +6428,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'), @@ -6568,7 +6567,7 @@ def list_library_application_usage(self, fleet_id, library_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_library_application_usage got unknown kwargs: {extra_kwargs!r}") @@ -6578,10 +6577,10 @@ def list_library_application_usage(self, fleet_id, library_key, **kwargs): "libraryKey": 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 'sort_by' in kwargs: @@ -6610,14 +6609,14 @@ def list_library_application_usage(self, fleet_id, library_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'), @@ -6753,7 +6752,7 @@ def list_library_managed_instance_usage(self, fleet_id, library_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_library_managed_instance_usage got unknown kwargs: {extra_kwargs!r}") @@ -6763,10 +6762,10 @@ def list_library_managed_instance_usage(self, fleet_id, library_key, **kwargs): "libraryKey": 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 'sort_by' in kwargs: @@ -6795,14 +6794,14 @@ def list_library_managed_instance_usage(self, fleet_id, library_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'), @@ -6937,7 +6936,7 @@ def list_performance_tuning_analysis_results(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_performance_tuning_analysis_results got unknown kwargs: {extra_kwargs!r}") @@ -6946,10 +6945,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: @@ -6978,14 +6977,14 @@ def list_performance_tuning_analysis_results(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'), @@ -7114,7 +7113,7 @@ def list_plugin_errors(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_plugin_errors got unknown kwargs: {extra_kwargs!r}") @@ -7146,14 +7145,14 @@ def list_plugin_errors(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'), @@ -7272,7 +7271,7 @@ def list_task_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_task_schedules got unknown kwargs: {extra_kwargs!r}") @@ -7302,14 +7301,14 @@ def list_task_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'), @@ -7433,7 +7432,7 @@ def list_uncorrelated_package_application_usage(self, fleet_id, package_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_uncorrelated_package_application_usage got unknown kwargs: {extra_kwargs!r}") @@ -7443,10 +7442,10 @@ def list_uncorrelated_package_application_usage(self, fleet_id, package_name, ** "packageName": 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') if 'sort_by' in kwargs: @@ -7473,14 +7472,14 @@ def list_uncorrelated_package_application_usage(self, fleet_id, package_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", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 list_uncorrelated_package_managed_instance_usage(self, fleet_id, package_nam "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_uncorrelated_package_managed_instance_usage got unknown kwargs: {extra_kwargs!r}") @@ -7616,10 +7615,10 @@ def list_uncorrelated_package_managed_instance_usage(self, fleet_id, package_nam "packageName": 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') if 'sort_by' in kwargs: @@ -7646,14 +7645,14 @@ def list_uncorrelated_package_managed_instance_usage(self, fleet_id, package_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", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -7780,7 +7779,7 @@ def list_uncorrelated_package_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"list_uncorrelated_package_usage got unknown kwargs: {extra_kwargs!r}") @@ -7789,10 +7788,10 @@ def list_uncorrelated_package_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: @@ -7820,14 +7819,14 @@ def list_uncorrelated_package_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'), @@ -7917,7 +7916,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}") @@ -7926,24 +7925,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'), @@ -8033,7 +8032,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}") @@ -8042,24 +8041,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'), @@ -8149,7 +8148,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}") @@ -8158,24 +8157,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'), @@ -8292,7 +8291,7 @@ def list_work_requests(self, **kwargs): "operation_type", "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_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -8322,14 +8321,14 @@ def list_work_requests(self, **kwargs): "operationType": kwargs.get("operation_type", 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'), @@ -8428,7 +8427,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}") @@ -8437,10 +8436,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 = { @@ -8450,7 +8449,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'), @@ -8534,7 +8533,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}") @@ -8543,10 +8542,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 = { @@ -8554,7 +8553,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'), @@ -8638,7 +8637,7 @@ def request_deployed_application_migration_analyses(self, fleet_id, request_depl "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_deployed_application_migration_analyses got unknown kwargs: {extra_kwargs!r}") @@ -8647,10 +8646,10 @@ def request_deployed_application_migration_analyses(self, fleet_id, request_depl "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 = { @@ -8658,7 +8657,7 @@ def request_deployed_application_migration_analyses(self, fleet_id, request_depl "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8742,7 +8741,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}") @@ -8751,10 +8750,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 = { @@ -8762,7 +8761,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'), @@ -8845,7 +8844,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}") @@ -8854,10 +8853,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 = { @@ -8865,7 +8864,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'), @@ -8949,7 +8948,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}") @@ -8958,10 +8957,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 = { @@ -8969,7 +8968,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'), @@ -9068,7 +9067,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}") @@ -9077,10 +9076,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 = { @@ -9090,7 +9089,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'), @@ -9190,7 +9189,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}") @@ -9199,10 +9198,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 = { @@ -9212,7 +9211,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'), @@ -9383,7 +9382,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}") @@ -9392,10 +9391,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: @@ -9441,14 +9440,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'), @@ -9620,7 +9619,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}") @@ -9629,10 +9628,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: @@ -9685,14 +9684,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'), @@ -9843,7 +9842,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}") @@ -9852,10 +9851,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: @@ -9889,14 +9888,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'), @@ -10039,7 +10038,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}") @@ -10048,10 +10047,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: @@ -10083,14 +10082,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'), @@ -10185,7 +10184,7 @@ def summarize_fleet_errors(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"summarize_fleet_errors got unknown kwargs: {extra_kwargs!r}") @@ -10196,14 +10195,14 @@ def summarize_fleet_errors(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'), @@ -10360,7 +10359,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}") @@ -10369,10 +10368,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: @@ -10422,14 +10421,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'), @@ -10572,7 +10571,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}") @@ -10581,10 +10580,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: @@ -10616,14 +10615,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'), @@ -10754,7 +10753,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}") @@ -10763,10 +10762,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: @@ -10795,14 +10794,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'), @@ -10965,7 +10964,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}") @@ -10974,10 +10973,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: @@ -11034,14 +11033,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'), @@ -11143,7 +11142,7 @@ def summarize_library_inventory(self, fleet_id, **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_library_inventory got unknown kwargs: {extra_kwargs!r}") @@ -11152,10 +11151,10 @@ def summarize_library_inventory(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 = { @@ -11164,14 +11163,14 @@ def summarize_library_inventory(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'), @@ -11318,7 +11317,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}") @@ -11327,10 +11326,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: @@ -11363,14 +11362,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'), @@ -11540,7 +11539,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}") @@ -11549,10 +11548,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: @@ -11611,14 +11610,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'), @@ -11713,7 +11712,7 @@ def summarize_plugin_errors(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"summarize_plugin_errors got unknown kwargs: {extra_kwargs!r}") @@ -11724,14 +11723,14 @@ def summarize_plugin_errors(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'), @@ -11828,7 +11827,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}") @@ -11839,14 +11838,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'), @@ -11948,7 +11947,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}") @@ -11958,10 +11957,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 = { @@ -11971,7 +11970,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'), @@ -12063,7 +12062,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}") @@ -12072,10 +12071,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 = { @@ -12084,7 +12083,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'), @@ -12177,7 +12176,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}") @@ -12186,10 +12185,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 = { @@ -12198,7 +12197,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'), @@ -12298,7 +12297,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}") @@ -12307,10 +12306,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 = { @@ -12320,7 +12319,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'), @@ -12414,7 +12413,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}") @@ -12423,10 +12422,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 = { @@ -12435,7 +12434,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'), @@ -12526,7 +12525,7 @@ def update_jms_plugin(self, jms_plugin_id, update_jms_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_jms_plugin got unknown kwargs: {extra_kwargs!r}") @@ -12535,10 +12534,10 @@ def update_jms_plugin(self, jms_plugin_id, update_jms_plugin_details, **kwargs): "jmsPluginId": jms_plugin_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -12547,7 +12546,7 @@ def update_jms_plugin(self, jms_plugin_id, update_jms_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'), @@ -12648,7 +12647,7 @@ def update_task_schedule(self, update_task_schedule_details, task_schedule_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"update_task_schedule got unknown kwargs: {extra_kwargs!r}") @@ -12657,10 +12656,10 @@ def update_task_schedule(self, update_task_schedule_details, task_schedule_id, * "taskScheduleId": task_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 = { @@ -12670,7 +12669,7 @@ def update_task_schedule(self, update_task_schedule_details, task_schedule_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'), diff --git a/src/oci/jms_java_downloads/java_download_client.py b/src/oci/jms_java_downloads/java_download_client.py index 0bf76c5668..e4d6037dce 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 @@ -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'), @@ -274,7 +273,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}") @@ -285,7 +284,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'), @@ -371,7 +370,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}") @@ -382,7 +381,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'), @@ -469,7 +468,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}") @@ -480,7 +479,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'), @@ -567,7 +566,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}") @@ -576,10 +575,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 = { @@ -588,7 +587,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'), @@ -672,7 +671,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}") @@ -681,10 +680,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 = { @@ -693,7 +692,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'), @@ -777,7 +776,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}") @@ -786,10 +785,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 = { @@ -798,7 +797,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'), @@ -879,7 +878,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}") @@ -889,7 +888,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'), @@ -967,7 +966,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}") @@ -976,10 +975,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 = { @@ -987,7 +986,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'), @@ -1065,7 +1064,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}") @@ -1074,10 +1073,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 = { @@ -1085,7 +1084,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'), @@ -1163,7 +1162,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}") @@ -1172,10 +1171,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 = { @@ -1183,7 +1182,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'), @@ -1263,7 +1262,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}") @@ -1272,10 +1271,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 = { @@ -1283,7 +1282,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'), @@ -1361,7 +1360,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}") @@ -1370,10 +1369,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 = { @@ -1381,7 +1380,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'), @@ -1459,7 +1458,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}") @@ -1468,10 +1467,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 = { @@ -1479,7 +1478,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'), @@ -1613,7 +1612,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}") @@ -1646,14 +1645,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'), @@ -1767,7 +1766,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}") @@ -1803,14 +1802,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'), @@ -1938,7 +1937,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}") @@ -1977,14 +1976,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'), @@ -2106,7 +2105,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}") @@ -2150,14 +2149,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'), @@ -2262,7 +2261,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}") @@ -2296,14 +2295,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'), @@ -2401,7 +2400,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}") @@ -2410,10 +2409,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: @@ -2436,14 +2435,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'), @@ -2543,7 +2542,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}") @@ -2552,10 +2551,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: @@ -2578,14 +2577,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'), @@ -2701,7 +2700,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}") @@ -2737,14 +2736,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'), @@ -2822,7 +2821,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}") @@ -2832,7 +2831,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'), @@ -2921,7 +2920,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}") @@ -2930,10 +2929,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 = { @@ -2942,7 +2941,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'), @@ -3031,7 +3030,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}") @@ -3040,10 +3039,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 = { @@ -3052,7 +3051,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/jms_utils/jms_utils_client.py b/src/oci/jms_utils/jms_utils_client.py index be9b8dafd4..95d7bd7aa6 100644 --- a/src/oci/jms_utils/jms_utils_client.py +++ b/src/oci/jms_utils/jms_utils_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_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}") @@ -181,10 +180,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 = { @@ -193,7 +192,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'), @@ -281,7 +280,7 @@ def delete_java_migration_analysis(self, java_migration_analysis_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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 got unknown kwargs: {extra_kwargs!r}") @@ -290,10 +289,10 @@ def delete_java_migration_analysis(self, java_migration_analysis_id, **kwargs): "javaMigrationAnalysisId": java_migration_analysis_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 delete_java_migration_analysis(self, java_migration_analysis_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -390,7 +389,7 @@ def delete_performance_tuning_analysis(self, performance_tuning_analysis_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_performance_tuning_analysis got unknown kwargs: {extra_kwargs!r}") @@ -399,10 +398,10 @@ def delete_performance_tuning_analysis(self, performance_tuning_analysis_id, **k "performanceTuningAnalysisId": performance_tuning_analysis_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 delete_performance_tuning_analysis(self, performance_tuning_analysis_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'), @@ -493,7 +492,7 @@ def get_analyze_applications_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_analyze_applications_configuration got unknown kwargs: {extra_kwargs!r}") @@ -501,14 +500,14 @@ def get_analyze_applications_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'), @@ -591,7 +590,7 @@ def get_java_migration_analysis(self, java_migration_analysis_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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 got unknown kwargs: {extra_kwargs!r}") @@ -600,10 +599,10 @@ def get_java_migration_analysis(self, java_migration_analysis_id, **kwargs): "javaMigrationAnalysisId": java_migration_analysis_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -611,7 +610,7 @@ def get_java_migration_analysis(self, java_migration_analysis_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_performance_tuning_analysis(self, performance_tuning_analysis_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_performance_tuning_analysis got unknown kwargs: {extra_kwargs!r}") @@ -703,10 +702,10 @@ def get_performance_tuning_analysis(self, performance_tuning_analysis_id, **kwar "performanceTuningAnalysisId": performance_tuning_analysis_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_performance_tuning_analysis(self, performance_tuning_analysis_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'), @@ -798,7 +797,7 @@ def get_subscription_acknowledgment_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_subscription_acknowledgment_configuration got unknown kwargs: {extra_kwargs!r}") @@ -806,14 +805,14 @@ def get_subscription_acknowledgment_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'), @@ -896,7 +895,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}") @@ -905,10 +904,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 = { @@ -916,7 +915,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'), @@ -1030,7 +1029,7 @@ def list_java_migration_analysis(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_migration_analysis got unknown kwargs: {extra_kwargs!r}") @@ -1058,14 +1057,14 @@ def list_java_migration_analysis(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'), @@ -1185,7 +1184,7 @@ def list_performance_tuning_analysis(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_performance_tuning_analysis got unknown kwargs: {extra_kwargs!r}") @@ -1221,14 +1220,14 @@ def list_performance_tuning_analysis(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'), @@ -1319,7 +1318,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}") @@ -1328,24 +1327,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'), @@ -1450,7 +1449,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}") @@ -1459,10 +1458,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: @@ -1485,14 +1484,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'), @@ -1597,7 +1596,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}") @@ -1606,10 +1605,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: @@ -1632,14 +1631,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'), @@ -1763,7 +1762,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}") @@ -1799,14 +1798,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'), @@ -1895,7 +1894,7 @@ def request_java_migration_analysis(self, request_java_migration_analysis_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"request_java_migration_analysis got unknown kwargs: {extra_kwargs!r}") @@ -1906,7 +1905,7 @@ def request_java_migration_analysis(self, request_java_migration_analysis_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'), @@ -1994,7 +1993,7 @@ def request_performance_tuning_analysis(self, request_performance_tuning_analysi "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_analysis got unknown kwargs: {extra_kwargs!r}") @@ -2005,7 +2004,7 @@ def request_performance_tuning_analysis(self, request_performance_tuning_analysi "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2098,7 +2097,7 @@ def update_analyze_applications_configuration(self, update_analyze_applications_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_analyze_applications_configuration got unknown kwargs: {extra_kwargs!r}") @@ -2106,7 +2105,7 @@ def update_analyze_applications_configuration(self, update_analyze_applications_ 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", @@ -2114,7 +2113,7 @@ def update_analyze_applications_configuration(self, update_analyze_applications_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 update_subscription_acknowledgment_configuration(self, update_subscription_a "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_acknowledgment_configuration got unknown kwargs: {extra_kwargs!r}") @@ -2218,7 +2217,7 @@ def update_subscription_acknowledgment_configuration(self, update_subscription_a 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", @@ -2226,7 +2225,7 @@ def update_subscription_acknowledgment_configuration(self, update_subscription_a "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 9ca40fc45c..6a3a56c2b2 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 @@ -171,7 +170,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}") @@ -182,7 +181,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'), @@ -269,7 +268,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}") @@ -278,10 +277,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 = { @@ -290,7 +289,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'), @@ -366,7 +365,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}") @@ -375,10 +374,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 = { @@ -386,7 +385,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'), @@ -487,7 +486,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}") @@ -513,14 +512,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'), @@ -609,7 +608,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}") @@ -618,10 +617,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 = { @@ -630,7 +629,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 8f14b22c35..2f92b9868d 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 @@ -162,7 +161,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}") @@ -172,7 +171,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'), @@ -253,7 +252,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}") @@ -263,7 +262,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'), @@ -334,7 +333,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}") @@ -420,7 +419,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}") @@ -430,7 +429,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'), @@ -513,7 +512,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}") @@ -523,7 +522,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'), @@ -606,7 +605,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}") @@ -616,7 +615,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 dae739e7d7..91975afaff 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 @@ -179,7 +178,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}") @@ -188,10 +187,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 = { @@ -201,7 +200,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'), @@ -300,7 +299,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}") @@ -309,10 +308,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 = { @@ -322,7 +321,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'), @@ -410,7 +409,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}") @@ -421,7 +420,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'), @@ -517,7 +516,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}") @@ -526,10 +525,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 = { @@ -539,7 +538,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'), @@ -623,7 +622,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}") @@ -632,10 +631,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 = { @@ -643,7 +642,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'), @@ -733,7 +732,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}") @@ -743,10 +742,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 = { @@ -755,7 +754,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'), @@ -843,7 +842,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}") @@ -852,10 +851,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 = { @@ -864,7 +863,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'), @@ -971,7 +970,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}") @@ -997,14 +996,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'), @@ -1111,7 +1110,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}") @@ -1120,10 +1119,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: @@ -1154,14 +1153,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'), @@ -1262,7 +1261,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}") @@ -1271,10 +1270,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 = { @@ -1284,7 +1283,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'), @@ -1381,7 +1380,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}") @@ -1390,10 +1389,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 = { @@ -1402,7 +1401,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'), @@ -1502,7 +1501,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}") @@ -1511,10 +1510,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 = { @@ -1524,7 +1523,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 cae3068e86..ebb5849e3e 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 @@ -183,7 +182,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}") @@ -192,10 +191,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 = { @@ -205,7 +204,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'), @@ -310,7 +309,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}") @@ -319,10 +318,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 = { @@ -332,7 +331,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'), @@ -438,7 +437,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}") @@ -448,10 +447,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 = { @@ -461,7 +460,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'), @@ -570,7 +569,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}") @@ -579,10 +578,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 = { @@ -592,7 +591,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'), @@ -685,7 +684,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}") @@ -696,7 +695,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'), @@ -796,7 +795,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}") @@ -805,10 +804,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 = { @@ -817,7 +816,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'), @@ -921,7 +920,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}") @@ -930,10 +929,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 = { @@ -943,7 +942,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'), @@ -1045,7 +1044,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}") @@ -1054,10 +1053,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 = { @@ -1067,7 +1066,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'), @@ -1151,7 +1150,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}") @@ -1160,10 +1159,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 = { @@ -1171,7 +1170,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'), @@ -1257,7 +1256,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}") @@ -1267,10 +1266,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 = { @@ -1278,7 +1277,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'), @@ -1359,7 +1358,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}") @@ -1368,10 +1367,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 = { @@ -1379,7 +1378,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'), @@ -1455,7 +1454,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}") @@ -1465,7 +1464,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'), @@ -1555,7 +1554,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}") @@ -1566,7 +1565,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'), @@ -1662,7 +1661,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}") @@ -1671,10 +1670,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 = { @@ -1683,7 +1682,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'), @@ -1795,7 +1794,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}") @@ -1804,10 +1803,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: @@ -1830,14 +1829,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'), @@ -1973,7 +1972,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}") @@ -2024,14 +2023,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'), @@ -2150,7 +2149,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}") @@ -2163,7 +2162,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: @@ -2172,7 +2171,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.') @@ -2283,7 +2282,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}") @@ -2295,7 +2294,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'), @@ -2400,7 +2399,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}") @@ -2409,10 +2408,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 = { @@ -2422,7 +2421,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'), @@ -2532,7 +2531,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}") @@ -2542,10 +2541,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 = { @@ -2555,7 +2554,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'), @@ -2654,7 +2653,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}") @@ -2663,10 +2662,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 = { @@ -2675,7 +2674,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 ae8fb5798a..d211a85e72 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 @@ -186,7 +185,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}") @@ -195,10 +194,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 = { @@ -208,7 +207,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'), @@ -314,7 +313,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}") @@ -323,10 +322,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 = { @@ -336,7 +335,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'), @@ -445,7 +444,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}") @@ -454,10 +453,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 = { @@ -467,7 +466,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'), @@ -563,7 +562,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}") @@ -574,7 +573,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'), @@ -682,7 +681,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}") @@ -691,10 +690,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 = { @@ -704,7 +703,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'), @@ -808,7 +807,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}") @@ -817,10 +816,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 = { @@ -830,7 +829,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'), @@ -914,7 +913,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}") @@ -923,10 +922,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 = { @@ -934,7 +933,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'), @@ -1012,7 +1011,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}") @@ -1021,10 +1020,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 = { @@ -1032,7 +1031,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'), @@ -1155,7 +1154,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}") @@ -1164,10 +1163,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: @@ -1190,7 +1189,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", @@ -1199,7 +1198,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'), @@ -1308,7 +1307,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}") @@ -1334,14 +1333,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'), @@ -1463,7 +1462,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}") @@ -1471,7 +1470,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", @@ -1481,7 +1480,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: @@ -1490,7 +1489,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.') @@ -1606,7 +1605,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}") @@ -1614,7 +1613,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", @@ -1623,7 +1622,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'), @@ -1733,7 +1732,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}") @@ -1742,10 +1741,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 = { @@ -1755,7 +1754,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'), @@ -1854,7 +1853,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}") @@ -1863,10 +1862,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 = { @@ -1875,7 +1874,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 7f5107ed97..e66973a99b 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 @@ -161,7 +160,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}") @@ -171,7 +170,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'), @@ -260,7 +259,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}") @@ -268,7 +267,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", @@ -276,7 +275,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'), @@ -365,7 +364,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}") @@ -376,7 +375,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'), @@ -462,7 +461,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}") @@ -471,10 +470,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 = { @@ -483,7 +482,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'), @@ -566,7 +565,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}") @@ -575,10 +574,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 = { @@ -587,7 +586,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'), @@ -661,7 +660,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}") @@ -671,7 +670,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'), @@ -750,7 +749,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}") @@ -758,14 +757,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'), @@ -850,7 +849,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}") @@ -859,14 +858,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'), @@ -945,7 +944,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}") @@ -954,10 +953,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 = { @@ -965,7 +964,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'), @@ -1044,7 +1043,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}") @@ -1053,10 +1052,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 = { @@ -1064,7 +1063,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'), @@ -1167,7 +1166,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}") @@ -1193,14 +1192,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'), @@ -1312,7 +1311,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}") @@ -1340,14 +1339,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'), @@ -1456,7 +1455,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}") @@ -1483,14 +1482,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'), @@ -1599,7 +1598,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}") @@ -1626,14 +1625,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'), @@ -1748,7 +1747,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}") @@ -1783,14 +1782,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'), @@ -1880,7 +1879,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}") @@ -1888,7 +1887,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", @@ -1896,7 +1895,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'), @@ -1986,7 +1985,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}") @@ -1995,10 +1994,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 = { @@ -2007,7 +2006,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'), @@ -2097,7 +2096,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}") @@ -2106,10 +2105,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 = { @@ -2118,7 +2117,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 cf0074b26d..370492d43a 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 @@ -185,7 +184,7 @@ def get_resource_availability(self, service_name, limit_name, compartment_id, ** "subscription_id", "external_location" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -195,10 +194,10 @@ 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 = { @@ -207,14 +206,14 @@ def get_resource_availability(self, service_name, limit_name, compartment_id, ** "subscriptionId": kwargs.get("subscription_id", missing), "externalLocation": kwargs.get("external_location", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -329,7 +328,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}") @@ -358,14 +357,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'), @@ -490,7 +489,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}") @@ -529,14 +528,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'), @@ -640,7 +639,7 @@ def list_services(self, compartment_id, **kwargs): "opc_request_id", "subscription_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -667,14 +666,14 @@ def list_services(self, compartment_id, **kwargs): "page": kwargs.get("page", missing), "subscriptionId": kwargs.get("subscription_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/limits/quotas_client.py b/src/oci/limits/quotas_client.py index 5bd7dba531..56d1b70fb8 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 @@ -169,7 +168,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}") @@ -178,10 +177,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 = { @@ -190,7 +189,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'), @@ -277,7 +276,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}") @@ -288,7 +287,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'), @@ -378,7 +377,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}") @@ -387,16 +386,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", @@ -404,7 +403,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'), @@ -483,7 +482,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}") @@ -492,10 +491,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 = { @@ -503,7 +502,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'), @@ -612,7 +611,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}") @@ -647,14 +646,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'), @@ -741,7 +740,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}") @@ -750,10 +749,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 = { @@ -762,7 +761,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'), @@ -854,7 +853,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}") @@ -863,16 +862,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", @@ -880,7 +879,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 86b3501bc7..be3184cd4f 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 @@ -191,7 +190,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}") @@ -200,10 +199,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 = { @@ -213,7 +212,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'), @@ -322,7 +321,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}") @@ -332,10 +331,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 = { @@ -345,7 +344,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'), @@ -449,7 +448,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}") @@ -458,10 +457,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 = { @@ -471,7 +470,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'), @@ -575,7 +574,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}") @@ -584,10 +583,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 = { @@ -597,7 +596,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'), @@ -704,7 +703,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}") @@ -713,10 +712,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 = { @@ -726,7 +725,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'), @@ -830,7 +829,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}") @@ -839,10 +838,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 = { @@ -852,7 +851,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'), @@ -969,7 +968,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}") @@ -980,7 +979,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'), @@ -1085,7 +1084,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}") @@ -1094,10 +1093,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 = { @@ -1107,7 +1106,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'), @@ -1214,7 +1213,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}") @@ -1223,10 +1222,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 = { @@ -1236,7 +1235,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'), @@ -1343,7 +1342,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}") @@ -1352,10 +1351,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 = { @@ -1365,7 +1364,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'), @@ -1469,7 +1468,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}") @@ -1478,10 +1477,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 = { @@ -1491,7 +1490,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'), @@ -1594,7 +1593,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}") @@ -1605,10 +1604,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 = { @@ -1617,7 +1616,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'), @@ -1714,7 +1713,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}") @@ -1724,10 +1723,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 = { @@ -1736,7 +1735,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'), @@ -1832,7 +1831,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}") @@ -1842,10 +1841,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 = { @@ -1854,7 +1853,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'), @@ -1949,7 +1948,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}") @@ -1959,10 +1958,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 = { @@ -1971,7 +1970,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'), @@ -2066,7 +2065,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}") @@ -2076,10 +2075,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 = { @@ -2088,7 +2087,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'), @@ -2178,7 +2177,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}") @@ -2187,10 +2186,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 = { @@ -2199,7 +2198,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'), @@ -2297,7 +2296,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}") @@ -2307,10 +2306,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 = { @@ -2319,7 +2318,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'), @@ -2417,7 +2416,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}") @@ -2427,10 +2426,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 = { @@ -2439,7 +2438,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'), @@ -2537,7 +2536,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}") @@ -2547,10 +2546,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 = { @@ -2559,7 +2558,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'), @@ -2654,7 +2653,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}") @@ -2664,10 +2663,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 = { @@ -2676,7 +2675,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'), @@ -2776,7 +2775,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}") @@ -2787,10 +2786,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 = { @@ -2799,7 +2798,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'), @@ -2901,7 +2900,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}") @@ -2912,10 +2911,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 = { @@ -2924,7 +2923,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'), @@ -3021,7 +3020,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}") @@ -3031,10 +3030,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 = { @@ -3043,7 +3042,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'), @@ -3140,7 +3139,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}") @@ -3150,10 +3149,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 = { @@ -3162,7 +3161,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'), @@ -3259,7 +3258,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}") @@ -3269,10 +3268,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 = { @@ -3281,7 +3280,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'), @@ -3378,7 +3377,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}") @@ -3388,10 +3387,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 = { @@ -3400,7 +3399,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'), @@ -3492,7 +3491,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}") @@ -3501,10 +3500,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 = { @@ -3513,7 +3512,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'), @@ -3605,7 +3604,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}") @@ -3614,10 +3613,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 = { @@ -3626,7 +3625,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'), @@ -3723,7 +3722,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}") @@ -3733,10 +3732,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 = { @@ -3745,7 +3744,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'), @@ -3842,7 +3841,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}") @@ -3852,10 +3851,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 = { @@ -3864,7 +3863,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'), @@ -3961,7 +3960,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}") @@ -3971,10 +3970,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 = { @@ -3983,7 +3982,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'), @@ -4080,7 +4079,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}") @@ -4090,10 +4089,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 = { @@ -4102,7 +4101,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'), @@ -4181,7 +4180,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}") @@ -4190,10 +4189,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 = { @@ -4201,7 +4200,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'), @@ -4293,7 +4292,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}") @@ -4302,10 +4301,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 = { @@ -4314,7 +4313,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'), @@ -4411,7 +4410,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}") @@ -4421,10 +4420,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 = { @@ -4433,7 +4432,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'), @@ -4526,7 +4525,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}") @@ -4535,10 +4534,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 = { @@ -4547,7 +4546,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'), @@ -4640,7 +4639,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}") @@ -4649,10 +4648,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 = { @@ -4661,7 +4660,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'), @@ -4763,7 +4762,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}") @@ -4773,10 +4772,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 = { @@ -4785,7 +4784,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'), @@ -4882,7 +4881,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}") @@ -4892,14 +4891,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'), @@ -5029,7 +5028,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}") @@ -5065,14 +5064,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'), @@ -5165,7 +5164,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}") @@ -5174,10 +5173,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 = { @@ -5186,7 +5185,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'), @@ -5283,7 +5282,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}") @@ -5293,14 +5292,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'), @@ -5397,7 +5396,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}") @@ -5407,14 +5406,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'), @@ -5524,7 +5523,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}") @@ -5533,17 +5532,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", @@ -5551,7 +5550,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'), @@ -5645,7 +5644,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}") @@ -5654,10 +5653,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 = { @@ -5666,7 +5665,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'), @@ -5763,7 +5762,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}") @@ -5773,14 +5772,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'), @@ -5872,7 +5871,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}") @@ -5881,10 +5880,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 = { @@ -5893,7 +5892,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'), @@ -5990,7 +5989,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}") @@ -5999,24 +5998,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'), @@ -6131,7 +6130,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}") @@ -6142,10 +6141,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 = { @@ -6155,7 +6154,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'), @@ -6264,7 +6263,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}") @@ -6274,10 +6273,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 = { @@ -6287,7 +6286,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'), @@ -6396,7 +6395,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}") @@ -6406,10 +6405,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 = { @@ -6419,7 +6418,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'), @@ -6530,7 +6529,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}") @@ -6540,10 +6539,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 = { @@ -6553,7 +6552,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'), @@ -6662,7 +6661,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}") @@ -6672,10 +6671,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 = { @@ -6685,7 +6684,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'), @@ -6789,7 +6788,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}") @@ -6798,10 +6797,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 = { @@ -6811,7 +6810,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'), @@ -6920,7 +6919,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}") @@ -6929,10 +6928,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 = { @@ -6942,7 +6941,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'), @@ -7046,7 +7045,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}") @@ -7055,10 +7054,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 = { @@ -7068,7 +7067,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'), @@ -7182,7 +7181,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}") @@ -7192,10 +7191,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 = { @@ -7205,7 +7204,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'), @@ -7317,7 +7316,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}") @@ -7327,10 +7326,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 = { @@ -7340,7 +7339,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'), @@ -7452,7 +7451,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}") @@ -7462,10 +7461,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 = { @@ -7475,7 +7474,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'), @@ -7584,7 +7583,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}") @@ -7594,10 +7593,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 = { @@ -7607,7 +7606,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 f313f18f65..6f34ab3184 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 @@ -170,7 +169,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}") @@ -179,10 +178,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 = { @@ -191,7 +190,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_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}") @@ -295,10 +294,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 = { @@ -308,7 +307,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'), @@ -406,7 +405,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}") @@ -415,10 +414,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 = { @@ -428,7 +427,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'), @@ -515,7 +514,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}") @@ -526,7 +525,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'), @@ -613,7 +612,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}") @@ -624,7 +623,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'), @@ -711,7 +710,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}") @@ -722,7 +721,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'), @@ -809,7 +808,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}") @@ -818,10 +817,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 = { @@ -830,7 +829,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'), @@ -922,7 +921,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}") @@ -931,10 +930,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 = { @@ -944,7 +943,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'), @@ -1069,7 +1068,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}") @@ -1114,14 +1113,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'), @@ -1201,7 +1200,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}") @@ -1210,10 +1209,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 = { @@ -1221,7 +1220,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'), @@ -1299,7 +1298,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}") @@ -1308,10 +1307,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 = { @@ -1319,7 +1318,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'), @@ -1397,7 +1396,7 @@ def get_access_request_internal(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_internal got unknown kwargs: {extra_kwargs!r}") @@ -1406,10 +1405,10 @@ def get_access_request_internal(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 = { @@ -1417,7 +1416,7 @@ def get_access_request_internal(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'), @@ -1495,7 +1494,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}") @@ -1504,10 +1503,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 = { @@ -1515,7 +1514,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'), @@ -1593,7 +1592,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}") @@ -1602,10 +1601,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 = { @@ -1613,7 +1612,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'), @@ -1691,7 +1690,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}") @@ -1700,10 +1699,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 = { @@ -1711,7 +1710,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 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}") @@ -1817,10 +1816,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 = { @@ -1830,7 +1829,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'), @@ -1970,7 +1969,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}") @@ -2018,14 +2017,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'), @@ -2138,7 +2137,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}") @@ -2174,14 +2173,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'), @@ -2308,7 +2307,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}") @@ -2354,14 +2353,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'), @@ -2459,7 +2458,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}") @@ -2468,10 +2467,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: @@ -2494,14 +2493,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'), @@ -2601,7 +2600,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}") @@ -2610,10 +2609,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: @@ -2636,14 +2635,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'), @@ -2758,7 +2757,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}") @@ -2794,14 +2793,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'), @@ -2890,7 +2889,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}") @@ -2899,10 +2898,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 = { @@ -2911,7 +2910,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'), @@ -3002,7 +3001,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}") @@ -3011,10 +3010,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 = { @@ -3023,7 +3022,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 80db8ea29d..19ec30c038 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 @@ -183,7 +182,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}") @@ -193,10 +192,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 = { @@ -206,7 +205,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: @@ -303,7 +302,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}") @@ -313,10 +312,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 = { @@ -325,7 +324,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: @@ -452,7 +451,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}") @@ -462,17 +461,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", @@ -481,7 +480,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: @@ -494,7 +493,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.') @@ -606,7 +605,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}") @@ -615,10 +614,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 = { @@ -628,7 +627,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: @@ -735,7 +734,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}") @@ -744,10 +743,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: @@ -771,14 +770,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: @@ -877,7 +876,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}") @@ -887,10 +886,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 = { @@ -899,7 +898,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'), @@ -997,7 +996,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}") @@ -1007,10 +1006,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 = { @@ -1020,7 +1019,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: @@ -1125,7 +1124,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}") @@ -1135,10 +1134,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 = { @@ -1148,7 +1147,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: @@ -1253,7 +1252,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}") @@ -1263,10 +1262,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 = { @@ -1276,7 +1275,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: @@ -1381,7 +1380,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}") @@ -1391,10 +1390,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 = { @@ -1404,7 +1403,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: @@ -1503,7 +1502,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}") @@ -1513,10 +1512,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 = { @@ -1525,7 +1524,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: @@ -1627,7 +1626,7 @@ def change_lookup_compartment(self, namespace_name, lookup_name, change_lookup_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_lookup_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1637,10 +1636,10 @@ def change_lookup_compartment(self, namespace_name, lookup_name, change_lookup_c "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 = { @@ -1650,7 +1649,7 @@ def change_lookup_compartment(self, namespace_name, lookup_name, change_lookup_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: @@ -1756,7 +1755,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}") @@ -1766,10 +1765,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 = { @@ -1779,7 +1778,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: @@ -1883,7 +1882,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}") @@ -1893,17 +1892,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", @@ -1911,7 +1910,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'), @@ -1993,7 +1992,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}") @@ -2002,10 +2001,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 = { @@ -2013,7 +2012,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: @@ -2108,7 +2107,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}") @@ -2117,10 +2116,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 = { @@ -2129,7 +2128,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: @@ -2225,7 +2224,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}") @@ -2234,10 +2233,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 = { @@ -2246,7 +2245,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: @@ -2342,7 +2341,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}") @@ -2351,10 +2350,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 = { @@ -2363,7 +2362,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: @@ -2459,7 +2458,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}") @@ -2468,10 +2467,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 = { @@ -2480,7 +2479,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: @@ -2574,7 +2573,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}") @@ -2583,10 +2582,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 = { @@ -2595,7 +2594,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: @@ -2683,7 +2682,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}") @@ -2692,10 +2691,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 = { @@ -2703,7 +2702,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: @@ -2796,7 +2795,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}") @@ -2805,10 +2804,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 = { @@ -2817,7 +2816,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: @@ -2911,7 +2910,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}") @@ -2920,10 +2919,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 = { @@ -2932,7 +2931,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: @@ -3034,7 +3033,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}") @@ -3044,10 +3043,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 = { @@ -3057,7 +3056,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'), @@ -3145,7 +3144,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}") @@ -3155,10 +3154,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 = { @@ -3167,7 +3166,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'), @@ -3262,7 +3261,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}") @@ -3272,10 +3271,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 = { @@ -3285,7 +3284,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'), @@ -3377,7 +3376,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}") @@ -3387,16 +3386,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", @@ -3404,7 +3403,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'), @@ -3495,7 +3494,7 @@ def delete_log_analytics_entity(self, namespace_name, log_analytics_entity_id, * "opc_request_id", "is_force_delete" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -3505,16 +3504,16 @@ 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') query_params = { "isForceDelete": kwargs.get("is_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", @@ -3522,7 +3521,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'), @@ -3609,7 +3608,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}") @@ -3619,10 +3618,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 = { @@ -3631,7 +3630,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'), @@ -3716,7 +3715,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}") @@ -3726,10 +3725,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 = { @@ -3738,7 +3737,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'), @@ -3828,7 +3827,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}") @@ -3838,10 +3837,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 = { @@ -3850,7 +3849,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'), @@ -3947,7 +3946,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}") @@ -3957,16 +3956,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", @@ -3975,7 +3974,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'), @@ -4073,7 +4072,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}") @@ -4083,10 +4082,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 = { @@ -4096,7 +4095,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'), @@ -4185,7 +4184,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}") @@ -4195,10 +4194,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 = { @@ -4207,7 +4206,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'), @@ -4302,7 +4301,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}") @@ -4312,10 +4311,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 = { @@ -4325,7 +4324,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'), @@ -4414,7 +4413,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}") @@ -4424,10 +4423,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 = { @@ -4436,7 +4435,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'), @@ -4517,7 +4516,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}") @@ -4528,10 +4527,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 = { @@ -4539,7 +4538,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'), @@ -4619,7 +4618,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}") @@ -4630,10 +4629,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 = { @@ -4641,7 +4640,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'), @@ -4723,7 +4722,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}") @@ -4732,10 +4731,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 = { @@ -4744,7 +4743,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'), @@ -4838,7 +4837,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}") @@ -4848,10 +4847,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 = { @@ -4860,7 +4859,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: @@ -4954,7 +4953,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}") @@ -4964,10 +4963,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 = { @@ -4976,7 +4975,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'), @@ -5066,7 +5065,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}") @@ -5076,10 +5075,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 = { @@ -5088,7 +5087,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: @@ -5179,7 +5178,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}") @@ -5188,10 +5187,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 = { @@ -5200,7 +5199,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'), @@ -5294,7 +5293,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}") @@ -5304,10 +5303,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 = { @@ -5316,7 +5315,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: @@ -5410,7 +5409,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}") @@ -5420,10 +5419,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 = { @@ -5432,7 +5431,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'), @@ -5522,7 +5521,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}") @@ -5532,10 +5531,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 = { @@ -5544,7 +5543,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: @@ -5646,7 +5645,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}") @@ -5655,10 +5654,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 = { @@ -5668,7 +5667,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: @@ -5756,7 +5755,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}") @@ -5765,10 +5764,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 = { @@ -5776,7 +5775,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: @@ -5863,7 +5862,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}") @@ -5872,10 +5871,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 = { @@ -5883,7 +5882,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: @@ -5978,7 +5977,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}") @@ -5987,10 +5986,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 = { @@ -5999,7 +5998,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: @@ -6087,7 +6086,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}") @@ -6096,10 +6095,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 = { @@ -6107,7 +6106,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: @@ -6208,7 +6207,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}") @@ -6217,10 +6216,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: @@ -6233,7 +6232,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", @@ -6241,7 +6240,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: @@ -6345,7 +6344,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}") @@ -6354,10 +6353,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: @@ -6370,7 +6369,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", @@ -6378,7 +6377,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: @@ -6468,7 +6467,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}") @@ -6477,10 +6476,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 = { @@ -6488,7 +6487,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: @@ -6575,7 +6574,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}") @@ -6584,23 +6583,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'), @@ -6683,7 +6682,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}") @@ -6693,10 +6692,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 = { @@ -6704,7 +6703,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'), @@ -6793,7 +6792,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}") @@ -6802,16 +6801,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", @@ -6819,7 +6818,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'), @@ -6905,7 +6904,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}") @@ -6915,10 +6914,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 = { @@ -6926,7 +6925,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'), @@ -7007,7 +7006,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}") @@ -7017,10 +7016,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 = { @@ -7028,7 +7027,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'), @@ -7109,7 +7108,7 @@ def get_field_usages(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_usages got unknown kwargs: {extra_kwargs!r}") @@ -7119,10 +7118,10 @@ def get_field_usages(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 = { @@ -7130,7 +7129,7 @@ def get_field_usages(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'), @@ -7212,7 +7211,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}") @@ -7221,23 +7220,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'), @@ -7320,7 +7319,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}") @@ -7330,10 +7329,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 = { @@ -7341,7 +7340,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'), @@ -7422,7 +7421,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}") @@ -7432,10 +7431,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 = { @@ -7443,7 +7442,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'), @@ -7521,7 +7520,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}") @@ -7530,10 +7529,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 = { @@ -7541,7 +7540,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'), @@ -7622,7 +7621,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}") @@ -7632,10 +7631,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 = { @@ -7643,7 +7642,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'), @@ -7722,7 +7721,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}") @@ -7731,23 +7730,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'), @@ -7828,7 +7827,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}") @@ -7837,23 +7836,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'), @@ -7938,7 +7937,7 @@ def get_log_analytics_entity(self, namespace_name, log_analytics_entity_id, **kw "opc_request_id", "is_show_associated_sources_count" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -7948,23 +7947,23 @@ 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') query_params = { "isShowAssociatedSourcesCount": kwargs.get("is_show_associated_sources_count", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -8045,7 +8044,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}") @@ -8055,10 +8054,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 = { @@ -8066,7 +8065,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'), @@ -8145,7 +8144,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}") @@ -8155,10 +8154,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 = { @@ -8166,7 +8165,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'), @@ -8247,7 +8246,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}") @@ -8256,23 +8255,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'), @@ -8357,7 +8356,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}") @@ -8367,10 +8366,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 = { @@ -8378,7 +8377,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'), @@ -8456,7 +8455,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}") @@ -8465,10 +8464,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 = { @@ -8476,7 +8475,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'), @@ -8557,7 +8556,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}") @@ -8567,10 +8566,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 = { @@ -8578,7 +8577,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'), @@ -8660,7 +8659,7 @@ def get_lookup_summary(self, namespace_name, **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_lookup_summary got unknown kwargs: {extra_kwargs!r}") @@ -8669,23 +8668,23 @@ 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') 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'), @@ -8765,7 +8764,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}") @@ -8774,10 +8773,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 = { @@ -8785,7 +8784,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'), @@ -8866,7 +8865,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}") @@ -8876,10 +8875,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 = { @@ -8887,7 +8886,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'), @@ -8965,7 +8964,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}") @@ -8974,10 +8973,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 = { @@ -8985,7 +8984,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'), @@ -9083,7 +9082,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}") @@ -9092,10 +9091,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: @@ -9118,14 +9117,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'), @@ -9233,7 +9232,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}") @@ -9242,10 +9241,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: @@ -9263,14 +9262,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'), @@ -9355,7 +9354,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}") @@ -9365,10 +9364,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 = { @@ -9376,7 +9375,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'), @@ -9454,7 +9453,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}") @@ -9463,10 +9462,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 = { @@ -9474,7 +9473,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'), @@ -9560,7 +9559,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}") @@ -9569,24 +9568,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'), @@ -9669,7 +9668,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}") @@ -9678,23 +9677,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'), @@ -9778,7 +9777,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}") @@ -9788,10 +9787,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 = { @@ -9799,7 +9798,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'), @@ -9883,7 +9882,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}") @@ -9893,23 +9892,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'), @@ -9989,7 +9988,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}") @@ -9998,10 +9997,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 = { @@ -10009,7 +10008,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'), @@ -10087,7 +10086,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}") @@ -10096,10 +10095,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 = { @@ -10107,7 +10106,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'), @@ -10186,7 +10185,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}") @@ -10195,10 +10194,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 = { @@ -10206,7 +10205,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'), @@ -10290,7 +10289,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}") @@ -10300,10 +10299,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 = { @@ -10311,7 +10310,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'), @@ -10392,7 +10391,7 @@ def get_template(self, namespace_name, 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}") @@ -10402,10 +10401,10 @@ def get_template(self, namespace_name, 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 = { @@ -10413,7 +10412,7 @@ def get_template(self, namespace_name, 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'), @@ -10491,7 +10490,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}") @@ -10500,10 +10499,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 = { @@ -10511,7 +10510,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'), @@ -10592,7 +10591,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}") @@ -10602,10 +10601,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 = { @@ -10613,7 +10612,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'), @@ -10696,7 +10695,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}") @@ -10706,10 +10705,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 = { @@ -10717,7 +10716,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'), @@ -10823,7 +10822,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}") @@ -10832,16 +10831,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", @@ -10849,7 +10848,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: @@ -10862,7 +10861,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.') @@ -10994,7 +10993,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}") @@ -11004,10 +11003,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: @@ -11040,14 +11039,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'), @@ -11164,7 +11163,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}") @@ -11173,10 +11172,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: @@ -11203,14 +11202,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'), @@ -11313,7 +11312,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}") @@ -11323,10 +11322,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: @@ -11349,14 +11348,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'), @@ -11471,7 +11470,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}") @@ -11480,10 +11479,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: @@ -11509,14 +11508,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'), @@ -11615,7 +11614,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}") @@ -11624,10 +11623,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: @@ -11651,7 +11650,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", @@ -11784,7 +11783,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}") @@ -11793,10 +11792,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: @@ -11826,14 +11825,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'), @@ -11913,7 +11912,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}") @@ -11922,10 +11921,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 = { @@ -11933,7 +11932,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'), @@ -12041,7 +12040,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}") @@ -12051,10 +12050,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: @@ -12085,14 +12084,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'), @@ -12218,7 +12217,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}") @@ -12227,10 +12226,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: @@ -12266,14 +12265,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'), @@ -12416,7 +12415,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}") @@ -12425,10 +12424,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: @@ -12466,14 +12465,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'), @@ -12605,7 +12604,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}") @@ -12614,10 +12613,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: @@ -12660,14 +12659,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'), @@ -12755,7 +12754,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}") @@ -12764,24 +12763,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'), @@ -12886,7 +12885,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}") @@ -12895,10 +12894,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: @@ -12922,14 +12921,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'), @@ -13062,7 +13061,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}") @@ -13071,10 +13070,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: @@ -13117,14 +13116,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'), @@ -13249,7 +13248,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}") @@ -13258,10 +13257,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: @@ -13305,14 +13304,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'), @@ -13511,7 +13510,7 @@ def list_log_analytics_entities(self, namespace_name, compartment_id, **kwargs): "freeform_tag_exists", "is_show_associated_sources_count" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -13520,10 +13519,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: @@ -13587,14 +13586,14 @@ def list_log_analytics_entities(self, namespace_name, compartment_id, **kwargs): "freeformTagExists": self.base_client.generate_collection_format_param(kwargs.get("freeform_tag_exists", missing), 'multi'), "isShowAssociatedSourcesCount": kwargs.get("is_show_associated_sources_count", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13712,7 +13711,7 @@ def list_log_analytics_entity_topology(self, namespace_name, log_analytics_entit "metadata_equals", "context" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -13722,10 +13721,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: @@ -13758,14 +13757,14 @@ def list_log_analytics_entity_topology(self, namespace_name, log_analytics_entit "metadataEquals": self.base_client.generate_collection_format_param(kwargs.get("metadata_equals", missing), 'multi'), "context": kwargs.get("context", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -13887,7 +13886,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}") @@ -13896,10 +13895,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: @@ -13940,14 +13939,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'), @@ -14053,7 +14052,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}") @@ -14062,10 +14061,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: @@ -14090,14 +14089,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'), @@ -14211,7 +14210,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}") @@ -14220,10 +14219,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: @@ -14256,14 +14255,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'), @@ -14361,7 +14360,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}") @@ -14370,10 +14369,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: @@ -14389,14 +14388,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'), @@ -14532,7 +14531,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}") @@ -14541,10 +14540,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"] @@ -14594,14 +14593,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'), @@ -14701,7 +14700,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}") @@ -14710,10 +14709,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: @@ -14736,14 +14735,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'), @@ -14824,7 +14823,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}") @@ -14832,14 +14831,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'), @@ -14946,7 +14945,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}") @@ -14955,10 +14954,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: @@ -14983,14 +14982,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'), @@ -15098,7 +15097,7 @@ def list_parser_actions(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_parser_actions got unknown kwargs: {extra_kwargs!r}") @@ -15107,10 +15106,10 @@ def list_parser_actions(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: @@ -15135,14 +15134,14 @@ def list_parser_actions(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'), @@ -15246,7 +15245,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}") @@ -15255,10 +15254,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: @@ -15282,14 +15281,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'), @@ -15389,7 +15388,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}") @@ -15398,10 +15397,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: @@ -15424,14 +15423,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'), @@ -15574,7 +15573,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}") @@ -15583,10 +15582,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: @@ -15637,14 +15636,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'), @@ -15761,7 +15760,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}") @@ -15770,10 +15769,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: @@ -15800,14 +15799,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'), @@ -15916,7 +15915,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}") @@ -15925,10 +15924,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: @@ -15960,14 +15959,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'), @@ -16076,7 +16075,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}") @@ -16085,10 +16084,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: @@ -16113,14 +16112,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'), @@ -16233,7 +16232,7 @@ def list_recalled_info(self, namespace_name, **kwargs): "time_data_ended_less_than", "log_sets" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_info got unknown kwargs: {extra_kwargs!r}") @@ -16242,10 +16241,10 @@ def list_recalled_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') if 'sort_by' in kwargs: @@ -16271,14 +16270,14 @@ def list_recalled_info(self, namespace_name, **kwargs): "timeDataEndedLessThan": kwargs.get("time_data_ended_less_than", missing), "logSets": self.base_client.generate_collection_format_param(kwargs.get("log_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", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -16397,7 +16396,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}") @@ -16406,10 +16405,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: @@ -16436,14 +16435,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'), @@ -16569,7 +16568,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}") @@ -16578,10 +16577,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: @@ -16623,14 +16622,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'), @@ -16760,7 +16759,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}") @@ -16769,10 +16768,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"] @@ -16808,14 +16807,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'), @@ -16936,7 +16935,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}") @@ -16945,10 +16944,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: @@ -16983,14 +16982,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'), @@ -17110,7 +17109,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}") @@ -17120,10 +17119,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: @@ -17156,14 +17155,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'), @@ -17266,7 +17265,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}") @@ -17276,10 +17275,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: @@ -17302,14 +17301,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'), @@ -17409,7 +17408,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}") @@ -17418,10 +17417,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: @@ -17444,14 +17443,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'), @@ -17551,7 +17550,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}") @@ -17560,10 +17559,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: @@ -17586,14 +17585,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'), @@ -17700,7 +17699,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}") @@ -17710,10 +17709,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: @@ -17737,14 +17736,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'), @@ -17895,7 +17894,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}") @@ -17904,10 +17903,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: @@ -17947,14 +17946,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'), @@ -18062,7 +18061,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}") @@ -18072,10 +18071,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: @@ -18099,14 +18098,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'), @@ -18238,7 +18237,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}") @@ -18247,10 +18246,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: @@ -18294,14 +18293,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'), @@ -18389,7 +18388,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}") @@ -18398,24 +18397,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'), @@ -18503,7 +18502,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}") @@ -18512,24 +18511,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'), @@ -18657,7 +18656,7 @@ def list_templates(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_templates got unknown kwargs: {extra_kwargs!r}") @@ -18666,10 +18665,10 @@ def list_templates(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: @@ -18705,14 +18704,14 @@ def list_templates(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;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'), @@ -18826,7 +18825,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}") @@ -18836,10 +18835,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: @@ -18872,14 +18871,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'), @@ -18970,7 +18969,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}") @@ -18980,24 +18979,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'), @@ -19114,7 +19113,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}") @@ -19123,10 +19122,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: @@ -19159,14 +19158,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'), @@ -19319,7 +19318,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}") @@ -19328,10 +19327,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: @@ -19372,14 +19371,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'), @@ -19472,7 +19471,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}") @@ -19482,24 +19481,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'), @@ -19590,7 +19589,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}") @@ -19600,24 +19599,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'), @@ -19706,7 +19705,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}") @@ -19715,10 +19714,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 = { @@ -19726,14 +19725,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'), @@ -19819,7 +19818,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}") @@ -19828,10 +19827,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 = { @@ -19840,7 +19839,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'), @@ -19923,7 +19922,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}") @@ -19932,10 +19931,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 = { @@ -19944,7 +19943,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'), @@ -20022,7 +20021,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}") @@ -20031,10 +20030,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 = { @@ -20042,7 +20041,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: @@ -20138,7 +20137,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}") @@ -20148,10 +20147,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 = { @@ -20160,7 +20159,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'), @@ -20258,7 +20257,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}") @@ -20267,10 +20266,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 = { @@ -20280,7 +20279,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: @@ -20374,7 +20373,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}") @@ -20384,10 +20383,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 = { @@ -20396,7 +20395,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'), @@ -20483,7 +20482,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}") @@ -20492,24 +20491,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: @@ -20614,7 +20613,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}") @@ -20623,10 +20622,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 = { @@ -20636,7 +20635,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: @@ -20772,7 +20771,7 @@ def register_lookup(self, namespace_name, type, register_lookup_content_file_bod "expect", "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"register_lookup got unknown kwargs: {extra_kwargs!r}") @@ -20781,10 +20780,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"] @@ -20801,7 +20800,7 @@ def register_lookup(self, namespace_name, type, register_lookup_content_file_bod "type": type, "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;charset=UTF-8", @@ -20809,7 +20808,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: @@ -20822,7 +20821,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.') @@ -20936,7 +20935,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}") @@ -20945,10 +20944,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 = { @@ -20958,7 +20957,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: @@ -21061,7 +21060,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}") @@ -21071,10 +21070,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 = { @@ -21084,7 +21083,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: @@ -21178,7 +21177,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}") @@ -21187,10 +21186,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 = { @@ -21199,7 +21198,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: @@ -21285,7 +21284,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}") @@ -21294,10 +21293,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 = { @@ -21305,7 +21304,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: @@ -21401,7 +21400,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}") @@ -21411,10 +21410,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 = { @@ -21423,7 +21422,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: @@ -21518,7 +21517,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}") @@ -21528,10 +21527,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 = { @@ -21540,7 +21539,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'), @@ -21642,7 +21641,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}") @@ -21652,17 +21651,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", @@ -21670,7 +21669,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'), @@ -21757,7 +21756,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}") @@ -21766,24 +21765,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'), @@ -21864,7 +21863,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}") @@ -21873,10 +21872,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 = { @@ -21884,7 +21883,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: @@ -21982,7 +21981,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}") @@ -21991,16 +21990,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", @@ -22008,7 +22007,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: @@ -22115,7 +22114,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}") @@ -22124,10 +22123,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: @@ -22141,7 +22140,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", @@ -22149,7 +22148,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: @@ -22250,7 +22249,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}") @@ -22259,16 +22258,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", @@ -22276,7 +22275,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: @@ -22375,7 +22374,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}") @@ -22385,10 +22384,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 = { @@ -22397,7 +22396,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: @@ -22495,7 +22494,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}") @@ -22505,10 +22504,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 = { @@ -22517,7 +22516,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: @@ -22613,7 +22612,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}") @@ -22623,10 +22622,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 = { @@ -22635,7 +22634,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: @@ -22731,7 +22730,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}") @@ -22741,10 +22740,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 = { @@ -22753,7 +22752,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: @@ -22847,7 +22846,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}") @@ -22857,10 +22856,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 = { @@ -22869,7 +22868,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: @@ -22969,7 +22968,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}") @@ -22979,10 +22978,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 = { @@ -22991,7 +22990,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: @@ -23095,7 +23094,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}") @@ -23105,10 +23104,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 = { @@ -23118,7 +23117,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: @@ -23247,7 +23246,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}") @@ -23257,17 +23256,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", @@ -23276,7 +23275,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: @@ -23289,7 +23288,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.') @@ -23393,7 +23392,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}") @@ -23402,10 +23401,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 = { @@ -23414,7 +23413,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: @@ -23500,7 +23499,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}") @@ -23509,10 +23508,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 = { @@ -23520,7 +23519,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: @@ -23618,7 +23617,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}") @@ -23628,10 +23627,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 = { @@ -23640,7 +23639,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: @@ -23735,7 +23734,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}") @@ -23744,10 +23743,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 = { @@ -23756,7 +23755,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: @@ -23889,7 +23888,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}") @@ -23898,10 +23897,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: @@ -23923,7 +23922,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", @@ -23933,7 +23932,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: @@ -23946,7 +23945,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.') @@ -24091,7 +24090,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}") @@ -24100,10 +24099,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: @@ -24118,7 +24117,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", @@ -24128,7 +24127,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: @@ -24141,7 +24140,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.') @@ -24315,7 +24314,7 @@ def upload_log_file(self, namespace_name, log_source_name, filename, opc_meta_lo "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}") @@ -24324,10 +24323,10 @@ def upload_log_file(self, namespace_name, log_source_name, filename, opc_meta_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') query_params = { @@ -24342,7 +24341,7 @@ def upload_log_file(self, namespace_name, log_source_name, filename, opc_meta_lo "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", @@ -24353,7 +24352,7 @@ def upload_log_file(self, namespace_name, log_source_name, filename, opc_meta_lo "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: @@ -24366,7 +24365,7 @@ def upload_log_file(self, namespace_name, log_source_name, filename, opc_meta_lo 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.') @@ -24504,7 +24503,7 @@ def upload_otlp_logs(self, namespace_name, opc_meta_loggrpid, upload_otlp_logs_d "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_otlp_logs got unknown kwargs: {extra_kwargs!r}") @@ -24513,10 +24512,10 @@ def upload_otlp_logs(self, namespace_name, opc_meta_loggrpid, upload_otlp_logs_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 = { @@ -24529,7 +24528,7 @@ def upload_otlp_logs(self, namespace_name, opc_meta_loggrpid, upload_otlp_logs_d "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: @@ -24542,7 +24541,7 @@ def upload_otlp_logs(self, namespace_name, opc_meta_loggrpid, upload_otlp_logs_d upload_otlp_logs_details = kwargs.get("upload_otlp_logs_details", missing) if upload_otlp_logs_details is not missing and upload_otlp_logs_details is not None: - if (not isinstance(upload_otlp_logs_details, (six.binary_type, six.string_types)) and + if (not isinstance(upload_otlp_logs_details, (bytes, str)) and not hasattr(upload_otlp_logs_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -24650,7 +24649,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}") @@ -24659,16 +24658,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", @@ -24676,7 +24675,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: @@ -24780,7 +24779,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}") @@ -24789,10 +24788,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 = { @@ -24802,7 +24801,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: @@ -24906,7 +24905,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}") @@ -24915,10 +24914,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 = { @@ -24928,7 +24927,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: @@ -25032,7 +25031,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}") @@ -25041,10 +25040,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 = { @@ -25054,7 +25053,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: @@ -25172,7 +25171,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}") @@ -25181,10 +25180,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 = { @@ -25192,7 +25191,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", @@ -25201,7 +25200,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: @@ -25319,7 +25318,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}") @@ -25328,10 +25327,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: @@ -25354,7 +25353,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", @@ -25362,7 +25361,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: @@ -25452,7 +25451,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}") @@ -25461,10 +25460,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 = { @@ -25472,7 +25471,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: @@ -25562,7 +25561,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}") @@ -25571,24 +25570,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'), @@ -25675,7 +25674,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}") @@ -25684,10 +25683,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 = { @@ -25695,7 +25694,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: @@ -25804,7 +25803,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}") @@ -25813,10 +25812,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 = { @@ -25824,7 +25823,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", @@ -25832,7 +25831,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: @@ -25930,7 +25929,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}") @@ -25939,10 +25938,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 = { @@ -25951,7 +25950,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: @@ -26045,7 +26044,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}") @@ -26054,10 +26053,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 = { @@ -26065,14 +26064,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'), @@ -26172,7 +26171,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}") @@ -26182,16 +26181,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", @@ -26199,7 +26198,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 96c1271c76..bd3d4c1f02 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 @@ -178,7 +177,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}") @@ -187,10 +186,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 = { @@ -199,7 +198,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'), @@ -290,7 +289,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}") @@ -300,10 +299,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 = { @@ -312,7 +311,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'), @@ -412,7 +411,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}") @@ -421,10 +420,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 = { @@ -434,7 +433,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'), @@ -535,7 +534,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}") @@ -544,10 +543,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 = { @@ -557,7 +556,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'), @@ -648,7 +647,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}") @@ -657,10 +656,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 = { @@ -669,7 +668,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'), @@ -757,7 +756,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}") @@ -768,7 +767,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'), @@ -853,7 +852,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}") @@ -864,7 +863,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'), @@ -951,7 +950,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}") @@ -962,7 +961,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'), @@ -1049,7 +1048,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}") @@ -1059,10 +1058,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 = { @@ -1071,7 +1070,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'), @@ -1154,7 +1153,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}") @@ -1163,10 +1162,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 = { @@ -1175,7 +1174,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'), @@ -1258,7 +1257,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}") @@ -1267,10 +1266,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 = { @@ -1279,7 +1278,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'), @@ -1362,7 +1361,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}") @@ -1371,10 +1370,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 = { @@ -1383,7 +1382,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'), @@ -1466,7 +1465,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}") @@ -1475,10 +1474,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 = { @@ -1487,7 +1486,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'), @@ -1565,7 +1564,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}") @@ -1575,10 +1574,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 = { @@ -1586,7 +1585,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'), @@ -1663,7 +1662,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}") @@ -1672,10 +1671,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 = { @@ -1683,7 +1682,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'), @@ -1760,7 +1759,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}") @@ -1769,10 +1768,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 = { @@ -1780,7 +1779,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'), @@ -1857,7 +1856,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}") @@ -1866,10 +1865,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 = { @@ -1877,7 +1876,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'), @@ -1954,7 +1953,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}") @@ -1963,10 +1962,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 = { @@ -1974,7 +1973,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'), @@ -2084,7 +2083,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}") @@ -2112,14 +2111,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'), @@ -2229,7 +2228,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}") @@ -2257,14 +2256,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'), @@ -2389,7 +2388,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}") @@ -2398,10 +2397,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: @@ -2443,14 +2442,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'), @@ -2526,7 +2525,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}") @@ -2536,7 +2535,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'), @@ -2658,7 +2657,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}") @@ -2696,14 +2695,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'), @@ -2791,7 +2790,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}") @@ -2800,24 +2799,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'), @@ -2907,7 +2906,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}") @@ -2916,24 +2915,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'), @@ -3048,7 +3047,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}") @@ -3083,14 +3082,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'), @@ -3182,7 +3181,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}") @@ -3192,10 +3191,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 = { @@ -3204,7 +3203,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'), @@ -3293,7 +3292,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}") @@ -3302,10 +3301,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 = { @@ -3314,7 +3313,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'), @@ -3402,7 +3401,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}") @@ -3411,10 +3410,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 = { @@ -3423,7 +3422,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'), @@ -3514,7 +3513,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}") @@ -3523,10 +3522,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 = { @@ -3535,7 +3534,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 00aa7def6b..7f5020427a 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 @@ -174,7 +173,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}") @@ -183,10 +182,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 = { @@ -196,7 +195,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 16b11c4c09..74999c8c9a 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 @@ -176,7 +175,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}") @@ -185,14 +184,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/lustre_file_storage/lustre_file_storage_client.py b/src/oci/lustre_file_storage/lustre_file_storage_client.py index a417a681db..5f446c2f22 100644 --- a/src/oci/lustre_file_storage/lustre_file_storage_client.py +++ b/src/oci/lustre_file_storage/lustre_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 @@ -172,7 +171,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}") @@ -181,10 +180,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 = { @@ -193,7 +192,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'), @@ -287,7 +286,7 @@ def change_lustre_file_system_compartment(self, lustre_file_system_id, change_lu "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_lustre_file_system_compartment got unknown kwargs: {extra_kwargs!r}") @@ -296,10 +295,10 @@ def change_lustre_file_system_compartment(self, lustre_file_system_id, change_lu "lustreFileSystemId": lustre_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 = { @@ -308,7 +307,7 @@ def change_lustre_file_system_compartment(self, lustre_file_system_id, change_lu "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 change_object_storage_link_compartment(self, object_storage_link_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_object_storage_link_compartment got unknown kwargs: {extra_kwargs!r}") @@ -421,10 +420,10 @@ def change_object_storage_link_compartment(self, object_storage_link_id, change_ "objectStorageLinkId": object_storage_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 = { @@ -434,7 +433,7 @@ def change_object_storage_link_compartment(self, object_storage_link_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'), @@ -526,7 +525,7 @@ def create_lustre_file_system(self, create_lustre_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_lustre_file_system got unknown kwargs: {extra_kwargs!r}") @@ -537,7 +536,7 @@ def create_lustre_file_system(self, create_lustre_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'), @@ -627,7 +626,7 @@ def create_object_storage_link(self, create_object_storage_link_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_object_storage_link got unknown kwargs: {extra_kwargs!r}") @@ -638,7 +637,7 @@ def create_object_storage_link(self, create_object_storage_link_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'), @@ -729,7 +728,7 @@ def delete_lustre_file_system(self, lustre_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_lustre_file_system got unknown kwargs: {extra_kwargs!r}") @@ -738,10 +737,10 @@ def delete_lustre_file_system(self, lustre_file_system_id, **kwargs): "lustreFileSystemId": lustre_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 = { @@ -750,7 +749,7 @@ def delete_lustre_file_system(self, lustre_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'), @@ -838,7 +837,7 @@ def delete_object_storage_link(self, object_storage_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_object_storage_link got unknown kwargs: {extra_kwargs!r}") @@ -847,10 +846,10 @@ def delete_object_storage_link(self, object_storage_link_id, **kwargs): "objectStorageLinkId": object_storage_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 = { @@ -859,7 +858,7 @@ def delete_object_storage_link(self, object_storage_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'), @@ -940,7 +939,7 @@ def get_lustre_file_system(self, lustre_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_lustre_file_system got unknown kwargs: {extra_kwargs!r}") @@ -949,10 +948,10 @@ def get_lustre_file_system(self, lustre_file_system_id, **kwargs): "lustreFileSystemId": lustre_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 = { @@ -960,7 +959,7 @@ def get_lustre_file_system(self, lustre_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'), @@ -1043,7 +1042,7 @@ def get_object_storage_link(self, object_storage_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_object_storage_link got unknown kwargs: {extra_kwargs!r}") @@ -1052,10 +1051,10 @@ def get_object_storage_link(self, object_storage_link_id, **kwargs): "objectStorageLinkId": object_storage_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 = { @@ -1063,7 +1062,7 @@ def get_object_storage_link(self, object_storage_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'), @@ -1158,7 +1157,7 @@ def get_sync_job(self, object_storage_link_id, sync_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"get_sync_job got unknown kwargs: {extra_kwargs!r}") @@ -1168,10 +1167,10 @@ def get_sync_job(self, object_storage_link_id, sync_job_id, **kwargs): "syncJobId": sync_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 = { @@ -1180,7 +1179,7 @@ def get_sync_job(self, object_storage_link_id, sync_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'), @@ -1263,7 +1262,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}") @@ -1272,10 +1271,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 = { @@ -1283,7 +1282,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'), @@ -1419,7 +1418,7 @@ def list_lustre_file_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_lustre_file_systems got unknown kwargs: {extra_kwargs!r}") @@ -1456,14 +1455,14 @@ def list_lustre_file_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'), @@ -1605,7 +1604,7 @@ def list_object_storage_links(self, **kwargs): "lustre_file_system_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_object_storage_links got unknown kwargs: {extra_kwargs!r}") @@ -1643,14 +1642,14 @@ def list_object_storage_links(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "lustreFileSystemId": kwargs.get("lustre_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'), @@ -1776,7 +1775,7 @@ def list_sync_jobs(self, object_storage_link_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_sync_jobs got unknown kwargs: {extra_kwargs!r}") @@ -1785,10 +1784,10 @@ def list_sync_jobs(self, object_storage_link_id, **kwargs): "objectStorageLinkId": object_storage_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') if 'sort_order' in kwargs: @@ -1819,7 +1818,7 @@ def list_sync_jobs(self, object_storage_link_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", @@ -1827,7 +1826,7 @@ def list_sync_jobs(self, object_storage_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'), @@ -1940,7 +1939,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}") @@ -1949,10 +1948,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: @@ -1975,14 +1974,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'), @@ -2095,7 +2094,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}") @@ -2104,10 +2103,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: @@ -2130,14 +2129,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'), @@ -2269,7 +2268,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}") @@ -2305,14 +2304,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'), @@ -2411,7 +2410,7 @@ def start_export_to_object(self, object_storage_link_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_export_to_object got unknown kwargs: {extra_kwargs!r}") @@ -2420,10 +2419,10 @@ def start_export_to_object(self, object_storage_link_id, **kwargs): "objectStorageLinkId": object_storage_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 = { @@ -2433,7 +2432,7 @@ def start_export_to_object(self, object_storage_link_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'), @@ -2533,7 +2532,7 @@ def start_import_from_object(self, object_storage_link_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_import_from_object got unknown kwargs: {extra_kwargs!r}") @@ -2542,10 +2541,10 @@ def start_import_from_object(self, object_storage_link_id, **kwargs): "objectStorageLinkId": object_storage_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 = { @@ -2555,7 +2554,7 @@ def start_import_from_object(self, object_storage_link_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'), @@ -2655,7 +2654,7 @@ def stop_export_to_object(self, object_storage_link_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_export_to_object got unknown kwargs: {extra_kwargs!r}") @@ -2664,10 +2663,10 @@ def stop_export_to_object(self, object_storage_link_id, **kwargs): "objectStorageLinkId": object_storage_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 = { @@ -2677,7 +2676,7 @@ def stop_export_to_object(self, object_storage_link_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'), @@ -2775,7 +2774,7 @@ def stop_import_from_object(self, object_storage_link_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_import_from_object got unknown kwargs: {extra_kwargs!r}") @@ -2784,10 +2783,10 @@ def stop_import_from_object(self, object_storage_link_id, **kwargs): "objectStorageLinkId": object_storage_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 = { @@ -2797,7 +2796,7 @@ def stop_import_from_object(self, object_storage_link_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'), @@ -2889,7 +2888,7 @@ def update_lustre_file_system(self, lustre_file_system_id, update_lustre_file_sy "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_lustre_file_system got unknown kwargs: {extra_kwargs!r}") @@ -2898,10 +2897,10 @@ def update_lustre_file_system(self, lustre_file_system_id, update_lustre_file_sy "lustreFileSystemId": lustre_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 = { @@ -2910,7 +2909,7 @@ def update_lustre_file_system(self, lustre_file_system_id, update_lustre_file_sy "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -3003,7 +3002,7 @@ def update_object_storage_link(self, object_storage_link_id, update_object_stora "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_link got unknown kwargs: {extra_kwargs!r}") @@ -3012,10 +3011,10 @@ def update_object_storage_link(self, object_storage_link_id, update_object_stora "objectStorageLinkId": object_storage_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 = { @@ -3024,7 +3023,7 @@ def update_object_storage_link(self, object_storage_link_id, update_object_stora "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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/managed_kafka/kafka_cluster_client.py b/src/oci/managed_kafka/kafka_cluster_client.py index 13231e9403..d46d131562 100644 --- a/src/oci/managed_kafka/kafka_cluster_client.py +++ b/src/oci/managed_kafka/kafka_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 @@ -172,7 +171,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}") @@ -181,10 +180,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 = { @@ -193,7 +192,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'), @@ -287,7 +286,7 @@ def change_kafka_cluster_compartment(self, kafka_cluster_id, change_kafka_cluste "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_kafka_cluster_compartment got unknown kwargs: {extra_kwargs!r}") @@ -296,10 +295,10 @@ def change_kafka_cluster_compartment(self, kafka_cluster_id, change_kafka_cluste "kafkaClusterId": kafka_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_kafka_cluster_compartment(self, kafka_cluster_id, change_kafka_cluste "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_kafka_cluster_config_compartment(self, kafka_cluster_config_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_kafka_cluster_config_compartment got unknown kwargs: {extra_kwargs!r}") @@ -413,10 +412,10 @@ def change_kafka_cluster_config_compartment(self, kafka_cluster_config_id, chang "kafkaClusterConfigId": kafka_cluster_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 = { @@ -425,7 +424,7 @@ def change_kafka_cluster_config_compartment(self, kafka_cluster_config_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'), @@ -514,7 +513,7 @@ def create_kafka_cluster(self, create_kafka_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_kafka_cluster got unknown kwargs: {extra_kwargs!r}") @@ -525,7 +524,7 @@ def create_kafka_cluster(self, create_kafka_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'), @@ -615,7 +614,7 @@ def create_kafka_cluster_config(self, create_kafka_cluster_config_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_kafka_cluster_config got unknown kwargs: {extra_kwargs!r}") @@ -626,7 +625,7 @@ def create_kafka_cluster_config(self, create_kafka_cluster_config_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'), @@ -717,7 +716,7 @@ def delete_kafka_cluster(self, kafka_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_kafka_cluster got unknown kwargs: {extra_kwargs!r}") @@ -726,10 +725,10 @@ def delete_kafka_cluster(self, kafka_cluster_id, **kwargs): "kafkaClusterId": kafka_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 = { @@ -738,7 +737,7 @@ def delete_kafka_cluster(self, kafka_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'), @@ -826,7 +825,7 @@ def delete_kafka_cluster_config(self, kafka_cluster_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_kafka_cluster_config got unknown kwargs: {extra_kwargs!r}") @@ -835,10 +834,10 @@ def delete_kafka_cluster_config(self, kafka_cluster_config_id, **kwargs): "kafkaClusterConfigId": kafka_cluster_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 = { @@ -847,7 +846,7 @@ def delete_kafka_cluster_config(self, kafka_cluster_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'), @@ -938,7 +937,7 @@ def delete_kafka_cluster_config_version(self, kafka_cluster_config_id, version_n "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_kafka_cluster_config_version got unknown kwargs: {extra_kwargs!r}") @@ -948,10 +947,10 @@ def delete_kafka_cluster_config_version(self, kafka_cluster_config_id, version_n "versionNumber": 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 = { @@ -960,7 +959,7 @@ def delete_kafka_cluster_config_version(self, kafka_cluster_config_id, version_n "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1056,7 +1055,7 @@ def disable_superuser(self, kafka_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"disable_superuser got unknown kwargs: {extra_kwargs!r}") @@ -1065,10 +1064,10 @@ def disable_superuser(self, kafka_cluster_id, **kwargs): "kafkaClusterId": kafka_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 = { @@ -1078,7 +1077,7 @@ def disable_superuser(self, kafka_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'), @@ -1178,7 +1177,7 @@ def enable_superuser(self, kafka_cluster_id, enable_superuser_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"enable_superuser got unknown kwargs: {extra_kwargs!r}") @@ -1187,10 +1186,10 @@ def enable_superuser(self, kafka_cluster_id, enable_superuser_details, **kwargs) "kafkaClusterId": kafka_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 = { @@ -1200,7 +1199,7 @@ def enable_superuser(self, kafka_cluster_id, enable_superuser_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'), @@ -1284,7 +1283,7 @@ def get_kafka_cluster(self, kafka_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_kafka_cluster got unknown kwargs: {extra_kwargs!r}") @@ -1293,10 +1292,10 @@ def get_kafka_cluster(self, kafka_cluster_id, **kwargs): "kafkaClusterId": kafka_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 = { @@ -1304,7 +1303,7 @@ def get_kafka_cluster(self, kafka_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'), @@ -1387,7 +1386,7 @@ def get_kafka_cluster_config(self, kafka_cluster_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_kafka_cluster_config got unknown kwargs: {extra_kwargs!r}") @@ -1396,10 +1395,10 @@ def get_kafka_cluster_config(self, kafka_cluster_config_id, **kwargs): "kafkaClusterConfigId": kafka_cluster_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 = { @@ -1407,7 +1406,7 @@ def get_kafka_cluster_config(self, kafka_cluster_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'), @@ -1493,7 +1492,7 @@ def get_kafka_cluster_config_version(self, kafka_cluster_config_id, version_numb "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_kafka_cluster_config_version got unknown kwargs: {extra_kwargs!r}") @@ -1503,10 +1502,10 @@ def get_kafka_cluster_config_version(self, kafka_cluster_config_id, version_numb "versionNumber": 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 = { @@ -1514,7 +1513,7 @@ def get_kafka_cluster_config_version(self, kafka_cluster_config_id, version_numb "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -1606,10 +1605,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 = { @@ -1617,7 +1616,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'), @@ -1729,7 +1728,7 @@ def list_kafka_cluster_config_versions(self, kafka_cluster_config_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_kafka_cluster_config_versions got unknown kwargs: {extra_kwargs!r}") @@ -1738,10 +1737,10 @@ def list_kafka_cluster_config_versions(self, kafka_cluster_config_id, **kwargs): "kafkaClusterConfigId": kafka_cluster_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') if 'sort_order' in kwargs: @@ -1764,14 +1763,14 @@ def list_kafka_cluster_config_versions(self, kafka_cluster_config_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 list_kafka_cluster_configs(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_kafka_cluster_configs got unknown kwargs: {extra_kwargs!r}") @@ -1939,14 +1938,14 @@ def list_kafka_cluster_configs(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'), @@ -2076,7 +2075,7 @@ def list_kafka_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_kafka_clusters got unknown kwargs: {extra_kwargs!r}") @@ -2112,14 +2111,14 @@ def list_kafka_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'), @@ -2230,7 +2229,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}") @@ -2239,10 +2238,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: @@ -2265,14 +2264,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'), @@ -2385,7 +2384,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}") @@ -2394,10 +2393,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: @@ -2420,14 +2419,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'), @@ -2559,7 +2558,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}") @@ -2595,14 +2594,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'), @@ -2695,7 +2694,7 @@ def update_kafka_cluster(self, kafka_cluster_id, update_kafka_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_kafka_cluster got unknown kwargs: {extra_kwargs!r}") @@ -2704,10 +2703,10 @@ def update_kafka_cluster(self, kafka_cluster_id, update_kafka_cluster_details, * "kafkaClusterId": kafka_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 = { @@ -2716,7 +2715,7 @@ def update_kafka_cluster(self, kafka_cluster_id, update_kafka_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'), @@ -2811,7 +2810,7 @@ def update_kafka_cluster_config(self, kafka_cluster_config_id, update_kafka_clus "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_kafka_cluster_config got unknown kwargs: {extra_kwargs!r}") @@ -2820,10 +2819,10 @@ def update_kafka_cluster_config(self, kafka_cluster_config_id, update_kafka_clus "kafkaClusterConfigId": kafka_cluster_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 = { @@ -2832,7 +2831,7 @@ def update_kafka_cluster_config(self, kafka_cluster_config_id, update_kafka_clus "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 922fbf701c..ff905fb823 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 @@ -180,7 +179,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}") @@ -189,10 +188,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 = { @@ -202,7 +201,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'), @@ -287,7 +286,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}") @@ -298,7 +297,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'), @@ -391,7 +390,7 @@ def create_named_credential(self, create_named_credential_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_named_credential got unknown kwargs: {extra_kwargs!r}") @@ -403,7 +402,7 @@ def create_named_credential(self, create_named_credential_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'), @@ -491,7 +490,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}") @@ -501,10 +500,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 = { @@ -513,7 +512,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'), @@ -595,7 +594,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}") @@ -604,10 +603,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 = { @@ -616,7 +615,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'), @@ -698,7 +697,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}") @@ -707,10 +706,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 = { @@ -719,7 +718,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'), @@ -801,7 +800,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}") @@ -810,10 +809,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 = { @@ -822,7 +821,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'), @@ -904,7 +903,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}") @@ -913,10 +912,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 = { @@ -925,7 +924,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'), @@ -1007,7 +1006,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}") @@ -1018,7 +1017,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'), @@ -1094,7 +1093,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}") @@ -1102,14 +1101,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'), @@ -1196,7 +1195,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}") @@ -1206,10 +1205,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 = { @@ -1218,7 +1217,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'), @@ -1295,7 +1294,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}") @@ -1304,10 +1303,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 = { @@ -1315,7 +1314,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'), @@ -1391,7 +1390,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}") @@ -1400,10 +1399,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 = { @@ -1411,7 +1410,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'), @@ -1491,7 +1490,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}") @@ -1500,23 +1499,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'), @@ -1602,7 +1601,7 @@ def get_named_credential(self, named_credential_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_named_credential got unknown kwargs: {extra_kwargs!r}") @@ -1611,10 +1610,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 = { @@ -1623,7 +1622,7 @@ def get_named_credential(self, named_credential_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'), @@ -1704,7 +1703,7 @@ def get_named_credentials_metadatum(self, compartment_id, **kwargs): "opc_request_id", "management_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"get_named_credentials_metadatum got unknown kwargs: {extra_kwargs!r}") @@ -1713,14 +1712,14 @@ def get_named_credentials_metadatum(self, compartment_id, **kwargs): "compartmentId": compartment_id, "managementAgentId": kwargs.get("management_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'), @@ -1796,7 +1795,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}") @@ -1805,10 +1804,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 = { @@ -1816,7 +1815,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'), @@ -1928,7 +1927,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}") @@ -1937,10 +1936,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: @@ -1965,14 +1964,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'), @@ -2074,7 +2073,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}") @@ -2083,10 +2082,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: @@ -2110,14 +2109,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'), @@ -2239,7 +2238,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}") @@ -2282,7 +2281,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", @@ -2290,7 +2289,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'), @@ -2401,7 +2400,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}") @@ -2437,14 +2436,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'), @@ -2560,7 +2559,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}") @@ -2605,14 +2604,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'), @@ -2776,7 +2775,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}") @@ -2852,14 +2851,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'), @@ -2971,7 +2970,7 @@ def list_named_credentials(self, management_agent_id, **kwargs): "type", "id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -3001,14 +3000,14 @@ def list_named_credentials(self, management_agent_id, **kwargs): "managementAgentId": management_agent_id, "id": self.base_client.generate_collection_format_param(kwargs.get("id", 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'), @@ -3104,7 +3103,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}") @@ -3113,10 +3112,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: @@ -3139,14 +3138,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'), @@ -3244,7 +3243,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}") @@ -3253,10 +3252,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: @@ -3279,14 +3278,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'), @@ -3406,7 +3405,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}") @@ -3451,14 +3450,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'), @@ -3543,7 +3542,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}") @@ -3554,7 +3553,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'), @@ -3655,7 +3654,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}") @@ -3682,14 +3681,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'), @@ -3779,7 +3778,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}") @@ -3796,14 +3795,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'), @@ -3901,7 +3900,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}") @@ -3911,10 +3910,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 = { @@ -3924,7 +3923,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'), @@ -4020,7 +4019,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}") @@ -4029,10 +4028,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 = { @@ -4042,7 +4041,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'), @@ -4140,7 +4139,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}") @@ -4149,10 +4148,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 = { @@ -4162,7 +4161,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'), @@ -4260,7 +4259,7 @@ def update_named_credential(self, named_credential_id, update_named_credential_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_named_credential got unknown kwargs: {extra_kwargs!r}") @@ -4269,10 +4268,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 = { @@ -4282,7 +4281,7 @@ def update_named_credential(self, named_credential_id, update_named_credential_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'), diff --git a/src/oci/management_dashboard/dashx_apis_client.py b/src/oci/management_dashboard/dashx_apis_client.py index bfcb3ccadc..52b0657346 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 @@ -179,7 +178,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}") @@ -188,10 +187,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 = { @@ -201,7 +200,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'), @@ -299,7 +298,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}") @@ -308,10 +307,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 = { @@ -321,7 +320,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'), @@ -411,7 +410,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}") @@ -422,7 +421,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'), @@ -510,7 +509,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}") @@ -521,7 +520,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'), @@ -606,7 +605,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}") @@ -615,10 +614,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 = { @@ -627,7 +626,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'), @@ -709,7 +708,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}") @@ -718,10 +717,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 = { @@ -730,7 +729,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'), @@ -819,7 +818,7 @@ def export_dashboard(self, export_dashboard_id, **kwargs): "opc_request_id", "export_tags" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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}") @@ -828,16 +827,16 @@ 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') query_params = { "exportTags": kwargs.get("export_tags", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -845,7 +844,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'), @@ -932,7 +931,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}") @@ -941,10 +940,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 = { @@ -953,7 +952,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'), @@ -1038,7 +1037,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}") @@ -1047,10 +1046,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 = { @@ -1059,7 +1058,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'), @@ -1136,7 +1135,7 @@ def get_oob_management_dashboard(self, management_dashboard_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_oob_management_dashboard got unknown kwargs: {extra_kwargs!r}") @@ -1145,10 +1144,10 @@ def get_oob_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 = { @@ -1156,7 +1155,7 @@ def get_oob_management_dashboard(self, management_dashboard_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 get_oob_management_saved_search(self, management_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_oob_management_saved_search got unknown kwargs: {extra_kwargs!r}") @@ -1241,10 +1240,10 @@ def get_oob_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 = { @@ -1252,7 +1251,7 @@ def get_oob_management_saved_search(self, management_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'), @@ -1362,7 +1361,7 @@ def import_dashboard(self, management_dashboard_import_details, **kwargs): "override_dashboard_compartment_ocid", "override_saved_search_compartment_ocid" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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}") @@ -1372,7 +1371,7 @@ def import_dashboard(self, management_dashboard_import_details, **kwargs): "overrideDashboardCompartmentOcid": kwargs.get("override_dashboard_compartment_ocid", missing), "overrideSavedSearchCompartmentOcid": kwargs.get("override_saved_search_compartment_ocid", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1381,7 +1380,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'), @@ -1482,7 +1481,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}") @@ -1509,14 +1508,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'), @@ -1616,7 +1615,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}") @@ -1643,14 +1642,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'), @@ -1750,7 +1749,7 @@ def list_oob_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_oob_management_dashboards got unknown kwargs: {extra_kwargs!r}") @@ -1777,14 +1776,14 @@ def list_oob_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'), @@ -1884,7 +1883,7 @@ def list_oob_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_oob_management_saved_searches got unknown kwargs: {extra_kwargs!r}") @@ -1911,14 +1910,14 @@ def list_oob_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'), @@ -2013,7 +2012,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}") @@ -2022,10 +2021,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 = { @@ -2035,7 +2034,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'), @@ -2133,7 +2132,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}") @@ -2142,10 +2141,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 = { @@ -2155,7 +2154,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 70f944f97c..c8c57d0c70 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 @@ -164,7 +163,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}") @@ -173,14 +172,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'), @@ -259,7 +258,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}") @@ -267,14 +266,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 555f3f7372..9ae5fa9f2a 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 @@ -177,7 +176,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}") @@ -186,10 +185,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 = { @@ -199,7 +198,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'), @@ -287,7 +286,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}") @@ -298,7 +297,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'), @@ -385,7 +384,7 @@ def create_marketplace_external_attested_metadata(self, create_marketplace_exter "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_marketplace_external_attested_metadata got unknown kwargs: {extra_kwargs!r}") @@ -396,7 +395,7 @@ def create_marketplace_external_attested_metadata(self, create_marketplace_exter "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -494,7 +493,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'), @@ -586,7 +585,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}") @@ -595,16 +594,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", @@ -612,7 +611,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'), @@ -697,7 +696,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}") @@ -706,10 +705,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 = { @@ -718,7 +717,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'), @@ -808,7 +807,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}") @@ -818,10 +817,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 = { @@ -830,7 +829,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'), @@ -912,7 +911,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}") @@ -921,10 +920,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 = { @@ -932,7 +931,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'), @@ -1022,7 +1021,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}") @@ -1033,23 +1032,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'), @@ -1154,7 +1153,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}") @@ -1163,23 +1162,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'), @@ -1286,7 +1285,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}") @@ -1296,23 +1295,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'), @@ -1393,7 +1392,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}") @@ -1402,10 +1401,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 = { @@ -1413,7 +1412,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'), @@ -1495,7 +1494,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}") @@ -1505,10 +1504,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 = { @@ -1516,7 +1515,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'), @@ -1595,7 +1594,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}") @@ -1604,10 +1603,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 = { @@ -1615,7 +1614,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'), @@ -1733,7 +1732,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}") @@ -1763,14 +1762,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'), @@ -1864,7 +1863,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}") @@ -1874,10 +1873,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 = { @@ -1885,14 +1884,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'), @@ -1983,7 +1982,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}") @@ -1993,14 +1992,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'), @@ -2168,7 +2167,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}") @@ -2220,14 +2219,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'), @@ -2327,7 +2326,7 @@ def list_marketplace_metadata_public_keys(self, **kwargs): "sort_by", "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_marketplace_metadata_public_keys got unknown kwargs: {extra_kwargs!r}") @@ -2353,14 +2352,14 @@ def list_marketplace_metadata_public_keys(self, **kwargs): "sortBy": kwargs.get("sort_by", 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'), @@ -2492,7 +2491,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}") @@ -2501,10 +2500,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: @@ -2530,14 +2529,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'), @@ -2648,7 +2647,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}") @@ -2657,10 +2656,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: @@ -2685,14 +2684,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'), @@ -2812,7 +2811,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}") @@ -2848,14 +2847,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'), @@ -2947,7 +2946,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}") @@ -2958,14 +2957,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'), @@ -3048,7 +3047,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}") @@ -3057,14 +3056,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'), @@ -3155,7 +3154,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}") @@ -3166,14 +3165,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'), @@ -3256,7 +3255,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}") @@ -3265,23 +3264,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'), @@ -3382,7 +3381,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}") @@ -3391,10 +3390,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: @@ -3417,14 +3416,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'), @@ -3525,7 +3524,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}") @@ -3534,10 +3533,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: @@ -3560,14 +3559,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'), @@ -3678,7 +3677,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}") @@ -3713,14 +3712,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'), @@ -3808,7 +3807,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}") @@ -3817,14 +3816,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'), @@ -3921,7 +3920,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}") @@ -3930,10 +3929,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 = { @@ -3943,7 +3942,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'), @@ -4041,7 +4040,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}") @@ -4050,10 +4049,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 = { @@ -4063,7 +4062,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_private_offer/attachment_client.py b/src/oci/marketplace_private_offer/attachment_client.py index 3cb6de1799..9275309236 100644 --- a/src/oci/marketplace_private_offer/attachment_client.py +++ b/src/oci/marketplace_private_offer/attachment_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 create_attachment(self, create_attachment_details, offer_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_attachment got unknown kwargs: {extra_kwargs!r}") @@ -180,10 +179,10 @@ def create_attachment(self, create_attachment_details, offer_id, **kwargs): "offerId": offer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 create_attachment(self, create_attachment_details, offer_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'), @@ -284,7 +283,7 @@ def delete_attachment(self, offer_id, 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"delete_attachment got unknown kwargs: {extra_kwargs!r}") @@ -294,10 +293,10 @@ def delete_attachment(self, offer_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') header_params = { @@ -306,7 +305,7 @@ def delete_attachment(self, offer_id, 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'), @@ -385,7 +384,7 @@ def get_attachment(self, offer_id, 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_attachment got unknown kwargs: {extra_kwargs!r}") @@ -395,10 +394,10 @@ def get_attachment(self, offer_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') header_params = { @@ -406,7 +405,7 @@ def get_attachment(self, offer_id, 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'), @@ -487,7 +486,7 @@ def get_attachment_content(self, offer_id, 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_attachment_content got unknown kwargs: {extra_kwargs!r}") @@ -497,10 +496,10 @@ def get_attachment_content(self, offer_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') header_params = { @@ -508,7 +507,7 @@ def get_attachment_content(self, offer_id, 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'), @@ -628,7 +627,7 @@ def list_attachments(self, offer_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_attachments got unknown kwargs: {extra_kwargs!r}") @@ -637,10 +636,10 @@ def list_attachments(self, offer_id, **kwargs): "offerId": offer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v 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: @@ -675,14 +674,14 @@ def list_attachments(self, offer_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_private_offer/offer_client.py b/src/oci/marketplace_private_offer/offer_client.py index 34631d8c53..dd91f71176 100644 --- a/src/oci/marketplace_private_offer/offer_client.py +++ b/src/oci/marketplace_private_offer/offer_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_offer(self, create_offer_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_offer got unknown kwargs: {extra_kwargs!r}") @@ -179,7 +178,7 @@ def create_offer(self, create_offer_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_offer(self, offer_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_offer got unknown kwargs: {extra_kwargs!r}") @@ -275,10 +274,10 @@ def delete_offer(self, offer_id, **kwargs): "offerId": offer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_offer(self, offer_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_offer(self, offer_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_offer got unknown kwargs: {extra_kwargs!r}") @@ -372,10 +371,10 @@ def get_offer(self, offer_id, **kwargs): "offerId": offer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_offer(self, offer_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 get_offer_internal_detail(self, offer_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_offer_internal_detail got unknown kwargs: {extra_kwargs!r}") @@ -470,10 +469,10 @@ def get_offer_internal_detail(self, offer_id, **kwargs): "offerId": offer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 get_offer_internal_detail(self, offer_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -598,7 +597,7 @@ def list_offers(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_offers got unknown kwargs: {extra_kwargs!r}") @@ -635,14 +634,14 @@ def list_offers(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'), @@ -731,7 +730,7 @@ def update_offer(self, offer_id, update_offer_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_offer got unknown kwargs: {extra_kwargs!r}") @@ -740,10 +739,10 @@ def update_offer(self, offer_id, update_offer_details, **kwargs): "offerId": offer_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 update_offer(self, offer_id, update_offer_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/marketplace_publisher/marketplace_publisher_client.py b/src/oci/marketplace_publisher/marketplace_publisher_client.py index 36763e2e23..2190bf231d 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 @@ -169,7 +168,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}") @@ -178,10 +177,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 = { @@ -190,7 +189,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'), @@ -276,7 +275,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}") @@ -285,10 +284,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 = { @@ -297,7 +296,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'), @@ -389,7 +388,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}") @@ -398,10 +397,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 = { @@ -411,7 +410,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'), @@ -504,7 +503,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}") @@ -513,10 +512,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 = { @@ -526,7 +525,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'), @@ -622,7 +621,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}") @@ -631,10 +630,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 = { @@ -644,7 +643,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'), @@ -742,7 +741,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}") @@ -751,10 +750,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 = { @@ -764,7 +763,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'), @@ -851,7 +850,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}") @@ -860,10 +859,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 = { @@ -872,7 +871,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'), @@ -969,7 +968,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}") @@ -978,10 +977,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 = { @@ -991,7 +990,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'), @@ -1086,7 +1085,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}") @@ -1095,10 +1094,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 = { @@ -1108,7 +1107,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'), @@ -1205,7 +1204,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}") @@ -1216,7 +1215,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'), @@ -1309,7 +1308,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}") @@ -1320,7 +1319,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'), @@ -1407,7 +1406,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}") @@ -1418,7 +1417,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'), @@ -1505,7 +1504,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}") @@ -1516,7 +1515,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'), @@ -1603,7 +1602,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}") @@ -1614,7 +1613,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'), @@ -1701,7 +1700,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}") @@ -1712,7 +1711,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'), @@ -1799,7 +1798,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}") @@ -1810,7 +1809,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'), @@ -1912,7 +1911,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}") @@ -1924,7 +1923,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: @@ -1933,7 +1932,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.') @@ -2040,7 +2039,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}") @@ -2049,10 +2048,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 = { @@ -2062,7 +2061,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'), @@ -2147,7 +2146,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}") @@ -2156,10 +2155,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 = { @@ -2168,7 +2167,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'), @@ -2252,7 +2251,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}") @@ -2261,10 +2260,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 = { @@ -2273,7 +2272,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'), @@ -2357,7 +2356,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}") @@ -2366,10 +2365,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 = { @@ -2378,7 +2377,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'), @@ -2462,7 +2461,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}") @@ -2471,10 +2470,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 = { @@ -2483,7 +2482,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'), @@ -2567,7 +2566,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}") @@ -2576,10 +2575,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 = { @@ -2588,7 +2587,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'), @@ -2672,7 +2671,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}") @@ -2681,10 +2680,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 = { @@ -2693,7 +2692,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'), @@ -2777,7 +2776,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}") @@ -2786,10 +2785,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 = { @@ -2798,7 +2797,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'), @@ -2874,7 +2873,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}") @@ -2883,10 +2882,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 = { @@ -2894,7 +2893,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'), @@ -2975,7 +2974,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}") @@ -2984,23 +2983,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'), @@ -3080,7 +3079,7 @@ def get_lead(self, lead_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_lead got unknown kwargs: {extra_kwargs!r}") @@ -3089,10 +3088,10 @@ def get_lead(self, lead_id, **kwargs): "leadId": lead_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 get_lead(self, lead_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -3187,10 +3186,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 = { @@ -3198,7 +3197,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'), @@ -3276,7 +3275,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}") @@ -3285,10 +3284,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 = { @@ -3296,7 +3295,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'), @@ -3374,7 +3373,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}") @@ -3383,10 +3382,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 = { @@ -3394,7 +3393,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'), @@ -3472,7 +3471,7 @@ def get_listing_revision_attachment_content(self, listing_revision_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_listing_revision_attachment_content got unknown kwargs: {extra_kwargs!r}") @@ -3481,10 +3480,10 @@ def get_listing_revision_attachment_content(self, listing_revision_attachment_id "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 = { @@ -3492,7 +3491,7 @@ def get_listing_revision_attachment_content(self, listing_revision_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'), @@ -3570,7 +3569,7 @@ def get_listing_revision_icon_content(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_icon_content got unknown kwargs: {extra_kwargs!r}") @@ -3579,10 +3578,10 @@ def get_listing_revision_icon_content(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 = { @@ -3590,7 +3589,7 @@ def get_listing_revision_icon_content(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'), @@ -3668,7 +3667,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}") @@ -3677,10 +3676,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 = { @@ -3688,7 +3687,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'), @@ -3766,7 +3765,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}") @@ -3775,10 +3774,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 = { @@ -3786,7 +3785,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'), @@ -3864,7 +3863,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}") @@ -3873,10 +3872,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 = { @@ -3884,7 +3883,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'), @@ -3962,7 +3961,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}") @@ -3971,10 +3970,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 = { @@ -3982,7 +3981,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'), @@ -4060,7 +4059,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}") @@ -4069,10 +4068,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 = { @@ -4080,7 +4079,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'), @@ -4158,7 +4157,7 @@ def get_support_doc(self, support_doc_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_support_doc got unknown kwargs: {extra_kwargs!r}") @@ -4167,10 +4166,10 @@ def get_support_doc(self, support_doc_code, **kwargs): "supportDocCode": support_doc_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 = { @@ -4178,7 +4177,7 @@ def get_support_doc(self, support_doc_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'), @@ -4256,7 +4255,7 @@ def get_support_doc_content(self, support_doc_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_support_doc_content got unknown kwargs: {extra_kwargs!r}") @@ -4265,10 +4264,10 @@ def get_support_doc_content(self, support_doc_code, **kwargs): "supportDocCode": support_doc_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 = { @@ -4276,7 +4275,7 @@ def get_support_doc_content(self, support_doc_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'), @@ -4354,7 +4353,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}") @@ -4363,10 +4362,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 = { @@ -4374,7 +4373,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'), @@ -4452,7 +4451,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}") @@ -4461,10 +4460,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 = { @@ -4472,7 +4471,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'), @@ -4550,7 +4549,7 @@ def get_term_version_content(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_content got unknown kwargs: {extra_kwargs!r}") @@ -4559,10 +4558,10 @@ def get_term_version_content(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 = { @@ -4570,7 +4569,7 @@ def get_term_version_content(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'), @@ -4648,7 +4647,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}") @@ -4657,10 +4656,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 = { @@ -4668,7 +4667,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'), @@ -4784,7 +4783,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}") @@ -4827,14 +4826,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'), @@ -4936,7 +4935,7 @@ def list_available_services(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_available_services got unknown kwargs: {extra_kwargs!r}") @@ -4963,14 +4962,14 @@ def list_available_services(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'), @@ -5078,7 +5077,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}") @@ -5106,14 +5105,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'), @@ -5220,7 +5219,7 @@ def list_customer_instance_report_records(self, compartment_id, date_range, **kw "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_customer_instance_report_records got unknown kwargs: {extra_kwargs!r}") @@ -5254,14 +5253,14 @@ def list_customer_instance_report_records(self, compartment_id, date_range, **kw "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'), @@ -5368,7 +5367,7 @@ def list_disbursement_report_records(self, compartment_id, date_range, **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_disbursement_report_records got unknown kwargs: {extra_kwargs!r}") @@ -5402,14 +5401,14 @@ def list_disbursement_report_records(self, compartment_id, date_range, **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'), @@ -5513,7 +5512,7 @@ def list_leads(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_leads got unknown kwargs: {extra_kwargs!r}") @@ -5540,14 +5539,14 @@ def list_leads(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'), @@ -5659,7 +5658,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}") @@ -5695,14 +5694,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'), @@ -5804,7 +5803,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}") @@ -5831,14 +5830,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'), @@ -5950,7 +5949,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}") @@ -5986,14 +5985,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'), @@ -6114,7 +6113,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}") @@ -6158,14 +6157,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'), @@ -6281,7 +6280,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}") @@ -6324,14 +6323,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'), @@ -6439,7 +6438,7 @@ def list_markets(self, compartment_id, **kwargs): "name", "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_markets got unknown kwargs: {extra_kwargs!r}") @@ -6467,14 +6466,14 @@ def list_markets(self, compartment_id, **kwargs): "name": kwargs.get("name", 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", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -6582,7 +6581,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}") @@ -6610,14 +6609,14 @@ def list_products(self, compartment_id, **kwargs): "productGroup": kwargs.get("product_group", 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'), @@ -6719,7 +6718,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}") @@ -6746,14 +6745,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'), @@ -6861,7 +6860,7 @@ def list_support_docs(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_support_docs got unknown kwargs: {extra_kwargs!r}") @@ -6889,14 +6888,14 @@ def list_support_docs(self, compartment_id, **kwargs): "supportDocGroup": kwargs.get("support_doc_group", 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'), @@ -6996,7 +6995,7 @@ def list_supported_currencies(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_supported_currencies got unknown kwargs: {extra_kwargs!r}") @@ -7022,14 +7021,14 @@ def list_supported_currencies(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'), @@ -7131,7 +7130,7 @@ def list_supported_shapes(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_supported_shapes got unknown kwargs: {extra_kwargs!r}") @@ -7158,14 +7157,14 @@ def list_supported_shapes(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'), @@ -7271,7 +7270,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}") @@ -7299,14 +7298,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'), @@ -7408,7 +7407,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}") @@ -7435,14 +7434,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'), @@ -7540,7 +7539,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}") @@ -7549,10 +7548,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: @@ -7575,14 +7574,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'), @@ -7682,7 +7681,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}") @@ -7691,10 +7690,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: @@ -7717,14 +7716,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'), @@ -7838,7 +7837,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}") @@ -7874,14 +7873,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'), @@ -7975,7 +7974,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}") @@ -7984,10 +7983,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 = { @@ -7997,7 +7996,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'), @@ -8090,7 +8089,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}") @@ -8099,10 +8098,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 = { @@ -8112,7 +8111,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'), @@ -8208,7 +8207,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}") @@ -8217,10 +8216,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 = { @@ -8230,7 +8229,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'), @@ -8325,7 +8324,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}") @@ -8334,10 +8333,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 = { @@ -8347,7 +8346,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'), @@ -8443,7 +8442,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}") @@ -8452,10 +8451,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 = { @@ -8465,7 +8464,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'), @@ -8562,7 +8561,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}") @@ -8571,10 +8570,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 = { @@ -8584,7 +8583,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'), @@ -8672,7 +8671,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}") @@ -8681,10 +8680,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 = { @@ -8693,7 +8692,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'), @@ -8782,7 +8781,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}") @@ -8791,10 +8790,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 = { @@ -8803,7 +8802,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'), @@ -8894,7 +8893,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}") @@ -8903,10 +8902,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 = { @@ -8915,7 +8914,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'), @@ -9006,7 +9005,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}") @@ -9015,10 +9014,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 = { @@ -9027,7 +9026,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'), @@ -9126,7 +9125,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}") @@ -9135,10 +9134,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 = { @@ -9146,7 +9145,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: @@ -9155,7 +9154,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.') @@ -9266,7 +9265,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}") @@ -9275,10 +9274,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 = { @@ -9286,7 +9285,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: @@ -9295,7 +9294,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.') @@ -9398,7 +9397,7 @@ def update_listing_revision_note(self, listing_revision_note_id, update_listing_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_note got unknown kwargs: {extra_kwargs!r}") @@ -9407,10 +9406,10 @@ def update_listing_revision_note(self, listing_revision_note_id, update_listing_ "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 = { @@ -9419,7 +9418,7 @@ def update_listing_revision_note(self, listing_revision_note_id, update_listing_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9510,7 +9509,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}") @@ -9519,10 +9518,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 = { @@ -9531,7 +9530,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'), @@ -9622,7 +9621,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}") @@ -9631,10 +9630,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 = { @@ -9643,7 +9642,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'), @@ -9734,7 +9733,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}") @@ -9743,10 +9742,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 = { @@ -9755,7 +9754,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'), @@ -9858,7 +9857,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}") @@ -9867,10 +9866,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 = { @@ -9879,7 +9878,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: @@ -9888,7 +9887,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.') @@ -9996,7 +9995,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}") @@ -10005,10 +10004,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 = { @@ -10018,7 +10017,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'), @@ -10111,7 +10110,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}") @@ -10120,10 +10119,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 = { @@ -10133,7 +10132,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 7853439360..b7296c1e83 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 @@ -181,7 +180,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}") @@ -190,10 +189,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 = { @@ -203,7 +202,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'), @@ -303,7 +302,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}") @@ -312,10 +311,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 = { @@ -325,7 +324,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'), @@ -425,7 +424,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}") @@ -434,10 +433,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 = { @@ -447,7 +446,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'), @@ -547,7 +546,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}") @@ -556,10 +555,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 = { @@ -569,7 +568,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'), @@ -669,7 +668,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}") @@ -678,10 +677,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 = { @@ -691,7 +690,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'), @@ -791,7 +790,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}") @@ -800,10 +799,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 = { @@ -813,7 +812,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'), @@ -913,7 +912,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}") @@ -922,10 +921,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 = { @@ -935,7 +934,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'), @@ -1039,7 +1038,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}") @@ -1048,16 +1047,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", @@ -1066,7 +1065,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'), @@ -1170,7 +1169,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}") @@ -1179,16 +1178,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", @@ -1197,7 +1196,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'), @@ -1301,7 +1300,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}") @@ -1310,16 +1309,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", @@ -1328,7 +1327,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'), @@ -1432,7 +1431,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}") @@ -1441,16 +1440,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", @@ -1459,7 +1458,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'), @@ -1563,7 +1562,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}") @@ -1572,16 +1571,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", @@ -1590,7 +1589,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'), @@ -1679,7 +1678,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}") @@ -1690,7 +1689,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'), @@ -1777,7 +1776,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}") @@ -1788,7 +1787,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'), @@ -1875,7 +1874,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}") @@ -1886,7 +1885,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'), @@ -1973,7 +1972,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}") @@ -1984,7 +1983,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'), @@ -2071,7 +2070,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}") @@ -2082,7 +2081,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'), @@ -2169,7 +2168,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}") @@ -2180,7 +2179,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'), @@ -2267,7 +2266,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}") @@ -2278,7 +2277,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'), @@ -2375,7 +2374,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}") @@ -2384,10 +2383,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: @@ -2401,7 +2400,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", @@ -2409,7 +2408,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'), @@ -2506,7 +2505,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}") @@ -2516,17 +2515,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", @@ -2534,7 +2533,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'), @@ -2624,7 +2623,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}") @@ -2633,16 +2632,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", @@ -2650,7 +2649,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'), @@ -2740,7 +2739,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}") @@ -2749,16 +2748,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", @@ -2766,7 +2765,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'), @@ -2856,7 +2855,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}") @@ -2865,16 +2864,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", @@ -2882,7 +2881,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'), @@ -2972,7 +2971,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}") @@ -2981,16 +2980,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", @@ -2998,7 +2997,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'), @@ -3088,7 +3087,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}") @@ -3097,16 +3096,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", @@ -3114,7 +3113,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'), @@ -3204,7 +3203,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}") @@ -3213,16 +3212,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", @@ -3230,7 +3229,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'), @@ -3308,7 +3307,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}") @@ -3317,10 +3316,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 = { @@ -3328,7 +3327,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'), @@ -3413,7 +3412,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}") @@ -3423,23 +3422,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'), @@ -3519,7 +3518,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}") @@ -3528,10 +3527,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 = { @@ -3539,7 +3538,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'), @@ -3617,7 +3616,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}") @@ -3626,10 +3625,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 = { @@ -3637,7 +3636,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'), @@ -3715,7 +3714,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}") @@ -3724,10 +3723,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 = { @@ -3735,7 +3734,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'), @@ -3813,7 +3812,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}") @@ -3822,10 +3821,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 = { @@ -3833,7 +3832,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'), @@ -3911,7 +3910,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}") @@ -3920,10 +3919,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 = { @@ -3931,7 +3930,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'), @@ -4009,7 +4008,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}") @@ -4018,10 +4017,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 = { @@ -4029,7 +4028,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'), @@ -4118,7 +4117,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}") @@ -4127,10 +4126,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 = { @@ -4139,7 +4138,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'), @@ -4249,7 +4248,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}") @@ -4258,10 +4257,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: @@ -4286,14 +4285,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'), @@ -4443,7 +4442,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}") @@ -4494,14 +4493,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'), @@ -4616,7 +4615,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}") @@ -4652,14 +4651,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'), @@ -4777,7 +4776,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}") @@ -4814,14 +4813,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'), @@ -4933,7 +4932,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}") @@ -4962,14 +4961,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'), @@ -5084,7 +5083,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}") @@ -5120,14 +5119,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'), @@ -5241,7 +5240,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}") @@ -5277,14 +5276,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'), @@ -5399,7 +5398,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}") @@ -5435,14 +5434,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'), @@ -5556,7 +5555,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}") @@ -5592,14 +5591,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'), @@ -5697,7 +5696,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}") @@ -5716,14 +5715,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'), @@ -5820,7 +5819,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}") @@ -5829,10 +5828,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 = { @@ -5842,7 +5841,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'), @@ -5942,7 +5941,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}") @@ -5951,10 +5950,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 = { @@ -5964,7 +5963,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'), @@ -6064,7 +6063,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}") @@ -6073,10 +6072,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 = { @@ -6086,7 +6085,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'), @@ -6186,7 +6185,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}") @@ -6195,10 +6194,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 = { @@ -6208,7 +6207,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'), @@ -6308,7 +6307,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}") @@ -6317,10 +6316,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 = { @@ -6330,7 +6329,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'), @@ -6430,7 +6429,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}") @@ -6439,10 +6438,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 = { @@ -6452,7 +6451,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'), @@ -6552,7 +6551,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}") @@ -6561,10 +6560,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 = { @@ -6574,7 +6573,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'), @@ -6670,7 +6669,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}") @@ -6679,16 +6678,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", @@ -6696,7 +6695,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'), @@ -6793,7 +6792,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}") @@ -6802,16 +6801,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", @@ -6819,7 +6818,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'), @@ -6916,7 +6915,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}") @@ -6925,16 +6924,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", @@ -6942,7 +6941,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'), @@ -7039,7 +7038,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}") @@ -7048,16 +7047,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", @@ -7065,7 +7064,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'), @@ -7162,7 +7161,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}") @@ -7171,16 +7170,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", @@ -7188,7 +7187,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'), @@ -7285,7 +7284,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}") @@ -7294,16 +7293,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", @@ -7311,7 +7310,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'), @@ -7408,7 +7407,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}") @@ -7417,16 +7416,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", @@ -7434,7 +7433,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 f3dabd1f6c..b962a811e9 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 @@ -169,7 +168,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}") @@ -179,14 +178,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'), @@ -264,7 +263,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}") @@ -274,7 +273,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/mngdmac/mac_device_client.py b/src/oci/mngdmac/mac_device_client.py index 93661abe02..8406931110 100644 --- a/src/oci/mngdmac/mac_device_client.py +++ b/src/oci/mngdmac/mac_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 @@ -168,7 +167,7 @@ def get_mac_device(self, mac_device_id, mac_order_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_mac_device got unknown kwargs: {extra_kwargs!r}") @@ -178,10 +177,10 @@ def get_mac_device(self, mac_device_id, mac_order_id, **kwargs): "macOrderId": mac_order_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_mac_device(self, mac_device_id, mac_order_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -322,7 +321,7 @@ def list_mac_devices(self, mac_order_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_mac_devices got unknown kwargs: {extra_kwargs!r}") @@ -331,10 +330,10 @@ def list_mac_devices(self, mac_order_id, **kwargs): "macOrderId": mac_order_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v 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: @@ -368,14 +367,14 @@ def list_mac_devices(self, mac_order_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 terminate_mac_device(self, mac_device_id, mac_order_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"terminate_mac_device got unknown kwargs: {extra_kwargs!r}") @@ -488,10 +487,10 @@ def terminate_mac_device(self, mac_device_id, mac_order_id, **kwargs): "macOrderId": mac_order_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 terminate_mac_device(self, mac_device_id, mac_order_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/mngdmac/mac_order_client.py b/src/oci/mngdmac/mac_order_client.py index b516331c2a..bc9759667d 100644 --- a/src/oci/mngdmac/mac_order_client.py +++ b/src/oci/mngdmac/mac_order_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 cancel_mac_order(self, mac_order_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_mac_order got unknown kwargs: {extra_kwargs!r}") @@ -193,10 +192,10 @@ def cancel_mac_order(self, mac_order_id, **kwargs): "macOrderId": mac_order_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 cancel_mac_order(self, mac_order_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'), @@ -297,7 +296,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}") @@ -306,10 +305,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 = { @@ -318,7 +317,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'), @@ -412,7 +411,7 @@ def change_mac_order_compartment(self, mac_order_id, change_mac_order_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_mac_order_compartment got unknown kwargs: {extra_kwargs!r}") @@ -421,10 +420,10 @@ def change_mac_order_compartment(self, mac_order_id, change_mac_order_compartmen "macOrderId": mac_order_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -433,7 +432,7 @@ def change_mac_order_compartment(self, mac_order_id, change_mac_order_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'), @@ -522,7 +521,7 @@ def create_mac_order(self, create_mac_order_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_mac_order got unknown kwargs: {extra_kwargs!r}") @@ -533,7 +532,7 @@ def create_mac_order(self, create_mac_order_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'), @@ -617,7 +616,7 @@ def get_mac_order(self, mac_order_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_mac_order got unknown kwargs: {extra_kwargs!r}") @@ -626,10 +625,10 @@ def get_mac_order(self, mac_order_id, **kwargs): "macOrderId": mac_order_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -637,7 +636,7 @@ def get_mac_order(self, mac_order_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -720,7 +719,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}") @@ -729,10 +728,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 = { @@ -740,7 +739,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'), @@ -870,7 +869,7 @@ def list_mac_orders(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_mac_orders got unknown kwargs: {extra_kwargs!r}") @@ -906,14 +905,14 @@ def list_mac_orders(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'), @@ -1024,7 +1023,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}") @@ -1033,10 +1032,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: @@ -1059,14 +1058,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'), @@ -1179,7 +1178,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}") @@ -1188,10 +1187,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: @@ -1214,14 +1213,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'), @@ -1353,7 +1352,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}") @@ -1389,14 +1388,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'), @@ -1489,7 +1488,7 @@ def update_mac_order(self, mac_order_id, update_mac_order_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_mac_order got unknown kwargs: {extra_kwargs!r}") @@ -1498,10 +1497,10 @@ def update_mac_order(self, mac_order_id, update_mac_order_details, **kwargs): "macOrderId": mac_order_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1510,7 +1509,7 @@ def update_mac_order(self, mac_order_id, update_mac_order_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/model_deployment/model_deployment_client.py b/src/oci/model_deployment/model_deployment_client.py index ac5eb2dd9e..aabc33a00e 100644 --- a/src/oci/model_deployment/model_deployment_client.py +++ b/src/oci/model_deployment/model_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 @@ -168,7 +167,7 @@ def predict(self, model_deployment_id, request_body, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"predict got unknown kwargs: {extra_kwargs!r}") @@ -177,10 +176,10 @@ def predict(self, model_deployment_id, request_body, **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 = { @@ -188,7 +187,7 @@ def predict(self, model_deployment_id, request_body, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 predict_with_response_stream(self, model_deployment_id, request_body, **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"predict_with_response_stream got unknown kwargs: {extra_kwargs!r}") @@ -283,10 +282,10 @@ def predict_with_response_stream(self, model_deployment_id, request_body, **kwar "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 = { @@ -294,7 +293,7 @@ def predict_with_response_stream(self, model_deployment_id, request_body, **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'), diff --git a/src/oci/monitoring/monitoring_client.py b/src/oci/monitoring/monitoring_client.py index 030b063542..4958419818 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 @@ -187,7 +186,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}") @@ -196,10 +195,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 = { @@ -209,7 +208,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'), @@ -306,7 +305,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}") @@ -317,7 +316,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'), @@ -417,7 +416,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}") @@ -428,7 +427,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'), @@ -525,7 +524,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}") @@ -534,10 +533,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 = { @@ -546,7 +545,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'), @@ -642,7 +641,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}") @@ -651,10 +650,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 = { @@ -663,7 +662,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'), @@ -751,7 +750,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}") @@ -760,10 +759,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 = { @@ -771,7 +770,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'), @@ -903,7 +902,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}") @@ -912,10 +911,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: @@ -932,14 +931,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'), @@ -1031,7 +1030,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}") @@ -1040,10 +1039,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 = { @@ -1051,7 +1050,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'), @@ -1236,7 +1235,7 @@ def list_alarm_suppressions(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_alarm_suppressions got unknown kwargs: {extra_kwargs!r}") @@ -1290,14 +1289,14 @@ def list_alarm_suppressions(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'), @@ -1446,7 +1445,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}") @@ -1482,14 +1481,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'), @@ -1670,7 +1669,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}") @@ -1709,14 +1708,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'), @@ -1844,7 +1843,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}") @@ -1855,14 +1854,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'), @@ -1980,7 +1979,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}") @@ -1991,7 +1990,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'), @@ -2087,7 +2086,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}") @@ -2096,10 +2095,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 = { @@ -2108,7 +2107,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'), @@ -2223,7 +2222,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}") @@ -2232,24 +2231,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'), @@ -2367,7 +2366,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}") @@ -2376,24 +2375,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'), @@ -2503,7 +2502,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}") @@ -2512,14 +2511,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'), @@ -2620,7 +2619,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}") @@ -2629,10 +2628,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 = { @@ -2641,7 +2640,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/multicloud/metadata_client.py b/src/oci/multicloud/metadata_client.py index cc669231f8..c72fa85d87 100644 --- a/src/oci/multicloud/metadata_client.py +++ b/src/oci/multicloud/metadata_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 @@ -232,7 +231,7 @@ def list_external_location_details_metadata(self, subscription_id, subscription_ "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_location_details_metadata got unknown kwargs: {extra_kwargs!r}") @@ -278,14 +277,14 @@ def list_external_location_details_metadata(self, subscription_id, subscription_ "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 list_external_location_mapping_metadata(self, subscription_service_name, com "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_location_mapping_metadata got unknown kwargs: {extra_kwargs!r}") @@ -444,14 +443,14 @@ def list_external_location_mapping_metadata(self, subscription_service_name, com "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -581,7 +580,7 @@ def list_external_location_summaries_metadata(self, subscription_service_name, c "sort_by", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_location_summaries_metadata got unknown kwargs: {extra_kwargs!r}") @@ -623,14 +622,14 @@ def list_external_location_summaries_metadata(self, subscription_service_name, c "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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/multicloud/multi_clouds_metadata_client.py b/src/oci/multicloud/multi_clouds_metadata_client.py index 9606555163..1e694ee018 100644 --- a/src/oci/multicloud/multi_clouds_metadata_client.py +++ b/src/oci/multicloud/multi_clouds_metadata_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 get_multi_cloud_metadata(self, compartment_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"get_multi_cloud_metadata got unknown kwargs: {extra_kwargs!r}") @@ -180,23 +179,23 @@ def get_multi_cloud_metadata(self, compartment_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 = { "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'), @@ -311,7 +310,7 @@ def list_multi_cloud_metadata(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_multi_cloud_metadata got unknown kwargs: {extra_kwargs!r}") @@ -337,14 +336,14 @@ def list_multi_cloud_metadata(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/multicloud/multicloud_resources_client.py b/src/oci/multicloud/multicloud_resources_client.py index 53e9a6641a..07f152e862 100644 --- a/src/oci/multicloud/multicloud_resources_client.py +++ b/src/oci/multicloud/multicloud_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 @@ -215,7 +214,7 @@ def list_multicloud_resources(self, subscription_service_name, subscription_id, "external_location", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_multicloud_resources got unknown kwargs: {extra_kwargs!r}") @@ -251,14 +250,14 @@ def list_multicloud_resources(self, subscription_service_name, subscription_id, "subscriptionId": subscription_id, "externalLocation": kwargs.get("external_location", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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/multicloud/multicloudsubscriptions_client.py b/src/oci/multicloud/multicloudsubscriptions_client.py index 0ca251bfbe..2a610d966f 100644 --- a/src/oci/multicloud/multicloudsubscriptions_client.py +++ b/src/oci/multicloud/multicloudsubscriptions_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 @@ -198,7 +197,7 @@ def list_multicloud_subscriptions(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_multicloud_subscriptions got unknown kwargs: {extra_kwargs!r}") @@ -225,14 +224,14 @@ def list_multicloud_subscriptions(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/multicloud/omhub_network_anchor_client.py b/src/oci/multicloud/omhub_network_anchor_client.py index 5703814950..b6b817d491 100644 --- a/src/oci/multicloud/omhub_network_anchor_client.py +++ b/src/oci/multicloud/omhub_network_anchor_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 get_network_anchor(self, network_anchor_id, subscription_service_name, subsc "external_location", "should_fetch_vcn_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_network_anchor got unknown kwargs: {extra_kwargs!r}") @@ -192,10 +191,10 @@ def get_network_anchor(self, network_anchor_id, subscription_service_name, subsc "networkAnchorId": network_anchor_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') subscription_service_name_allowed_values = ["ORACLEDBATAZURE", "ORACLEDBATGOOGLE", "ORACLEDBATAWS"] @@ -210,14 +209,14 @@ def get_network_anchor(self, network_anchor_id, subscription_service_name, subsc "externalLocation": kwargs.get("external_location", missing), "shouldFetchVcnName": kwargs.get("should_fetch_vcn_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'), @@ -382,7 +381,7 @@ def list_network_anchors(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_network_anchors got unknown kwargs: {extra_kwargs!r}") @@ -432,14 +431,14 @@ def list_network_anchors(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/multicloud/omhub_resource_anchor_client.py b/src/oci/multicloud/omhub_resource_anchor_client.py index df28406ace..bdf7f2a50e 100644 --- a/src/oci/multicloud/omhub_resource_anchor_client.py +++ b/src/oci/multicloud/omhub_resource_anchor_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 get_resource_anchor(self, resource_anchor_id, subscription_service_name, sub "opc_request_id", "should_fetch_compartment_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_resource_anchor got unknown kwargs: {extra_kwargs!r}") @@ -188,10 +187,10 @@ def get_resource_anchor(self, resource_anchor_id, subscription_service_name, sub "resourceAnchorId": resource_anchor_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') subscription_service_name_allowed_values = ["ORACLEDBATAZURE", "ORACLEDBATGOOGLE", "ORACLEDBATAWS"] @@ -205,14 +204,14 @@ def get_resource_anchor(self, resource_anchor_id, subscription_service_name, sub "subscriptionId": subscription_id, "shouldFetchCompartmentName": kwargs.get("should_fetch_compartment_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'), @@ -371,7 +370,7 @@ def list_resource_anchors(self, **kwargs): "subscription_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_resource_anchors got unknown kwargs: {extra_kwargs!r}") @@ -419,14 +418,14 @@ def list_resource_anchors(self, **kwargs): "subscriptionServiceName": kwargs.get("subscription_service_name", missing), "subscriptionId": kwargs.get("subscription_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/mysql/channels_client.py b/src/oci/mysql/channels_client.py index a05ae602c8..b2a91870b7 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 @@ -171,7 +170,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}") @@ -182,7 +181,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'), @@ -273,7 +272,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}") @@ -282,10 +281,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 = { @@ -294,7 +293,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'), @@ -384,7 +383,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}") @@ -393,10 +392,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 = { @@ -405,7 +404,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'), @@ -539,7 +538,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}") @@ -577,14 +576,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'), @@ -684,7 +683,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}") @@ -693,10 +692,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 = { @@ -706,7 +705,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'), @@ -806,7 +805,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}") @@ -815,10 +814,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 = { @@ -828,7 +827,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'), @@ -932,7 +931,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}") @@ -941,10 +940,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 = { @@ -954,7 +953,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 4b6ac3288c..3b15236019 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 @@ -179,7 +178,7 @@ def cancel_backup_deletion(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_deletion got unknown kwargs: {extra_kwargs!r}") @@ -188,10 +187,10 @@ def cancel_backup_deletion(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 = { @@ -201,7 +200,7 @@ def cancel_backup_deletion(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'), @@ -301,7 +300,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}") @@ -310,10 +309,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 = { @@ -323,7 +322,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'), @@ -419,7 +418,7 @@ def copy_backup(self, copy_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"copy_backup got unknown kwargs: {extra_kwargs!r}") @@ -431,7 +430,7 @@ def copy_backup(self, copy_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'), @@ -521,7 +520,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}") @@ -532,7 +531,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'), @@ -621,7 +620,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}") @@ -630,10 +629,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 = { @@ -642,7 +641,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'), @@ -728,7 +727,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}") @@ -737,10 +736,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 = { @@ -749,7 +748,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'), @@ -902,7 +901,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}") @@ -971,14 +970,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'), @@ -1069,7 +1068,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}") @@ -1078,10 +1077,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 = { @@ -1090,7 +1089,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'), @@ -1193,7 +1192,7 @@ def validate_backup(self, backup_id, **kwargs): "opc_retry_token", "validate_backup_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"validate_backup got unknown kwargs: {extra_kwargs!r}") @@ -1202,10 +1201,10 @@ def validate_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 = { @@ -1215,7 +1214,7 @@ def validate_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'), diff --git a/src/oci/mysql/db_system_client.py b/src/oci/mysql/db_system_client.py index 641c6cf61e..701ee3945a 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 @@ -184,7 +183,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}") @@ -193,10 +192,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 = { @@ -206,7 +205,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'), @@ -298,7 +297,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}") @@ -309,7 +308,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'), @@ -401,7 +400,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}") @@ -410,10 +409,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 = { @@ -422,7 +421,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'), @@ -511,7 +510,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}") @@ -520,10 +519,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 = { @@ -532,7 +531,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'), @@ -621,7 +620,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}") @@ -630,10 +629,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 = { @@ -642,7 +641,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'), @@ -733,7 +732,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}") @@ -742,10 +741,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 = { @@ -754,7 +753,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'), @@ -844,7 +843,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}") @@ -853,10 +852,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 = { @@ -865,7 +864,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'), @@ -948,7 +947,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}") @@ -957,10 +956,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 = { @@ -968,7 +967,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'), @@ -1115,7 +1114,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}") @@ -1163,14 +1162,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'), @@ -1272,7 +1271,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}") @@ -1281,10 +1280,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 = { @@ -1294,7 +1293,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'), @@ -1394,7 +1393,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}") @@ -1403,10 +1402,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 = { @@ -1416,7 +1415,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'), @@ -1514,7 +1513,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}") @@ -1523,10 +1522,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 = { @@ -1536,7 +1535,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'), @@ -1634,7 +1633,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}") @@ -1643,10 +1642,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 = { @@ -1656,7 +1655,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'), @@ -1759,7 +1758,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}") @@ -1768,10 +1767,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 = { @@ -1781,7 +1780,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'), @@ -1881,7 +1880,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}") @@ -1890,10 +1889,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 = { @@ -1903,7 +1902,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'), @@ -2002,7 +2001,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}") @@ -2011,10 +2010,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 = { @@ -2023,7 +2022,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'), @@ -2116,7 +2115,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}") @@ -2125,10 +2124,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 = { @@ -2137,7 +2136,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 f38e563ed1..3119452805 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 @@ -171,7 +170,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}") @@ -182,7 +181,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'), @@ -270,7 +269,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}") @@ -279,10 +278,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 = { @@ -291,7 +290,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'), @@ -377,7 +376,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}") @@ -386,10 +385,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 = { @@ -398,7 +397,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'), @@ -538,7 +537,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}") @@ -584,14 +583,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'), @@ -690,7 +689,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}") @@ -709,14 +708,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'), @@ -800,7 +799,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}") @@ -808,14 +807,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'), @@ -906,7 +905,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}") @@ -915,10 +914,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 = { @@ -927,7 +926,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 6659261135..b1f573173f 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 @@ -171,7 +170,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}") @@ -182,7 +181,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'), @@ -273,7 +272,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}") @@ -282,10 +281,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 = { @@ -294,7 +293,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'), @@ -382,7 +381,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}") @@ -391,10 +390,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 = { @@ -403,7 +402,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'), @@ -543,7 +542,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}") @@ -582,14 +581,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'), @@ -682,7 +681,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}") @@ -691,10 +690,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 = { @@ -703,7 +702,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 945c370d42..00c179f910 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 @@ -170,7 +169,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}") @@ -179,10 +178,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 = { @@ -191,7 +190,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'), @@ -286,7 +285,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}") @@ -295,24 +294,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'), @@ -409,7 +408,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}") @@ -418,24 +417,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'), @@ -546,7 +545,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}") @@ -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/src/oci/network_firewall/network_firewall_client.py b/src/oci/network_firewall/network_firewall_client.py index 68a467faac..434a3a872f 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 @@ -180,7 +179,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}") @@ -189,10 +188,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 = { @@ -202,7 +201,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'), @@ -310,7 +309,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}") @@ -319,10 +318,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 = { @@ -331,7 +330,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: @@ -340,7 +339,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.') @@ -458,7 +457,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}") @@ -467,10 +466,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 = { @@ -479,7 +478,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: @@ -488,7 +487,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.') @@ -606,7 +605,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}") @@ -615,10 +614,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 = { @@ -627,7 +626,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: @@ -636,7 +635,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.') @@ -754,7 +753,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}") @@ -763,10 +762,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 = { @@ -775,7 +774,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: @@ -784,7 +783,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.') @@ -902,7 +901,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}") @@ -911,10 +910,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 = { @@ -923,7 +922,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: @@ -932,7 +931,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.') @@ -1050,7 +1049,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}") @@ -1059,10 +1058,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 = { @@ -1071,7 +1070,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: @@ -1080,7 +1079,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.') @@ -1198,7 +1197,7 @@ def bulk_upload_nat_rules(self, network_firewall_policy_id, bulk_upload_nat_rule "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_nat_rules got unknown kwargs: {extra_kwargs!r}") @@ -1207,10 +1206,10 @@ def bulk_upload_nat_rules(self, network_firewall_policy_id, bulk_upload_nat_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 = { @@ -1219,7 +1218,7 @@ def bulk_upload_nat_rules(self, network_firewall_policy_id, bulk_upload_nat_rule "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v 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: @@ -1228,7 +1227,7 @@ def bulk_upload_nat_rules(self, network_firewall_policy_id, bulk_upload_nat_rule bulk_upload_nat_rules_details = kwargs.get("bulk_upload_nat_rules_details", missing) if bulk_upload_nat_rules_details is not missing and bulk_upload_nat_rules_details is not None: - if (not isinstance(bulk_upload_nat_rules_details, (six.binary_type, six.string_types)) and + if (not isinstance(bulk_upload_nat_rules_details, (bytes, str)) and not hasattr(bulk_upload_nat_rules_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -1346,7 +1345,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}") @@ -1355,10 +1354,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 = { @@ -1367,7 +1366,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: @@ -1376,7 +1375,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.') @@ -1494,7 +1493,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}") @@ -1503,10 +1502,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 = { @@ -1515,7 +1514,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: @@ -1524,7 +1523,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.') @@ -1642,7 +1641,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}") @@ -1651,10 +1650,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 = { @@ -1663,7 +1662,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: @@ -1672,7 +1671,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.') @@ -1790,7 +1789,7 @@ def bulk_upload_tunnel_inspection_rules(self, network_firewall_policy_id, bulk_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"bulk_upload_tunnel_inspection_rules got unknown kwargs: {extra_kwargs!r}") @@ -1799,10 +1798,10 @@ def bulk_upload_tunnel_inspection_rules(self, network_firewall_policy_id, bulk_u "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 = { @@ -1811,7 +1810,7 @@ def bulk_upload_tunnel_inspection_rules(self, network_firewall_policy_id, bulk_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} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -1820,7 +1819,7 @@ def bulk_upload_tunnel_inspection_rules(self, network_firewall_policy_id, bulk_u bulk_upload_tunnel_inspection_rules_details = kwargs.get("bulk_upload_tunnel_inspection_rules_details", missing) if bulk_upload_tunnel_inspection_rules_details is not missing and bulk_upload_tunnel_inspection_rules_details is not None: - if (not isinstance(bulk_upload_tunnel_inspection_rules_details, (six.binary_type, six.string_types)) and + if (not isinstance(bulk_upload_tunnel_inspection_rules_details, (bytes, str)) and not hasattr(bulk_upload_tunnel_inspection_rules_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') @@ -1938,7 +1937,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}") @@ -1947,10 +1946,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 = { @@ -1959,7 +1958,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: @@ -1968,7 +1967,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.') @@ -2067,7 +2066,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}") @@ -2076,10 +2075,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 = { @@ -2088,7 +2087,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'), @@ -2185,7 +2184,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}") @@ -2194,10 +2193,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 = { @@ -2207,7 +2206,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'), @@ -2305,7 +2304,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}") @@ -2314,10 +2313,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 = { @@ -2327,7 +2326,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'), @@ -2425,7 +2424,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}") @@ -2434,10 +2433,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 = { @@ -2447,7 +2446,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'), @@ -2539,7 +2538,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}") @@ -2548,10 +2547,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 = { @@ -2560,7 +2559,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'), @@ -2652,7 +2651,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}") @@ -2661,10 +2660,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 = { @@ -2673,7 +2672,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'), @@ -2765,7 +2764,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}") @@ -2774,10 +2773,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 = { @@ -2786,7 +2785,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'), @@ -2878,7 +2877,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}") @@ -2887,10 +2886,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 = { @@ -2899,7 +2898,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'), @@ -2991,7 +2990,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}") @@ -3000,10 +2999,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 = { @@ -3012,7 +3011,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'), @@ -3104,7 +3103,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}") @@ -3113,10 +3112,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 = { @@ -3125,7 +3124,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'), @@ -3217,7 +3216,7 @@ def create_nat_rule(self, network_firewall_policy_id, create_nat_rule_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_nat_rule got unknown kwargs: {extra_kwargs!r}") @@ -3226,10 +3225,10 @@ def create_nat_rule(self, network_firewall_policy_id, create_nat_rule_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 = { @@ -3238,7 +3237,7 @@ def create_nat_rule(self, network_firewall_policy_id, create_nat_rule_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'), @@ -3327,7 +3326,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}") @@ -3338,7 +3337,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'), @@ -3425,7 +3424,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}") @@ -3436,7 +3435,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'), @@ -3526,7 +3525,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}") @@ -3535,10 +3534,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 = { @@ -3547,7 +3546,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'), @@ -3639,7 +3638,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}") @@ -3648,10 +3647,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 = { @@ -3660,7 +3659,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'), @@ -3752,7 +3751,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}") @@ -3761,10 +3760,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 = { @@ -3773,7 +3772,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'), @@ -3865,7 +3864,7 @@ def create_tunnel_inspection_rule(self, network_firewall_policy_id, create_tunne "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"create_tunnel_inspection_rule got unknown kwargs: {extra_kwargs!r}") @@ -3874,10 +3873,10 @@ def create_tunnel_inspection_rule(self, network_firewall_policy_id, create_tunne "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 = { @@ -3886,7 +3885,7 @@ def create_tunnel_inspection_rule(self, network_firewall_policy_id, create_tunne "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -3987,10 +3986,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 = { @@ -3999,7 +3998,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'), @@ -4091,7 +4090,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}") @@ -4101,10 +4100,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 = { @@ -4113,7 +4112,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'), @@ -4200,7 +4199,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}") @@ -4210,10 +4209,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 = { @@ -4222,7 +4221,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'), @@ -4309,7 +4308,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}") @@ -4319,10 +4318,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 = { @@ -4331,7 +4330,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'), @@ -4418,7 +4417,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}") @@ -4428,10 +4427,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 = { @@ -4440,7 +4439,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'), @@ -4527,7 +4526,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}") @@ -4537,10 +4536,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 = { @@ -4549,7 +4548,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'), @@ -4636,7 +4635,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}") @@ -4646,10 +4645,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 = { @@ -4658,7 +4657,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'), @@ -4745,7 +4744,7 @@ def delete_nat_rule(self, network_firewall_policy_id, nat_rule_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_nat_rule got unknown kwargs: {extra_kwargs!r}") @@ -4755,10 +4754,10 @@ def delete_nat_rule(self, network_firewall_policy_id, nat_rule_name, **kwargs): "natRuleName": nat_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 = { @@ -4767,7 +4766,7 @@ def delete_nat_rule(self, network_firewall_policy_id, nat_rule_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'), @@ -4853,7 +4852,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}") @@ -4862,10 +4861,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 = { @@ -4874,7 +4873,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'), @@ -4958,7 +4957,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}") @@ -4967,10 +4966,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 = { @@ -4979,7 +4978,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'), @@ -5066,7 +5065,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}") @@ -5076,10 +5075,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 = { @@ -5088,7 +5087,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'), @@ -5175,7 +5174,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}") @@ -5185,10 +5184,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 = { @@ -5197,7 +5196,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'), @@ -5284,7 +5283,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}") @@ -5294,10 +5293,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 = { @@ -5306,7 +5305,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'), @@ -5393,7 +5392,7 @@ def delete_tunnel_inspection_rule(self, network_firewall_policy_id, tunnel_inspe "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_tunnel_inspection_rule got unknown kwargs: {extra_kwargs!r}") @@ -5403,10 +5402,10 @@ def delete_tunnel_inspection_rule(self, network_firewall_policy_id, tunnel_inspe "tunnelInspectionRuleName": tunnel_inspection_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 = { @@ -5415,7 +5414,7 @@ def delete_tunnel_inspection_rule(self, network_firewall_policy_id, tunnel_inspe "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -5502,7 +5501,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}") @@ -5512,10 +5511,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 = { @@ -5524,7 +5523,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'), @@ -5603,7 +5602,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}") @@ -5613,10 +5612,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 = { @@ -5624,7 +5623,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'), @@ -5713,7 +5712,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}") @@ -5723,24 +5722,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'), @@ -5823,7 +5822,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}") @@ -5833,10 +5832,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 = { @@ -5844,7 +5843,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'), @@ -5925,7 +5924,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}") @@ -5935,10 +5934,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 = { @@ -5946,7 +5945,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'), @@ -6035,7 +6034,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}") @@ -6045,24 +6044,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'), @@ -6153,7 +6152,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}") @@ -6163,24 +6162,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'), @@ -6263,7 +6262,7 @@ def get_nat_rule(self, network_firewall_policy_id, nat_rule_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_nat_rule got unknown kwargs: {extra_kwargs!r}") @@ -6273,10 +6272,10 @@ def get_nat_rule(self, network_firewall_policy_id, nat_rule_name, **kwargs): "natRuleName": nat_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 = { @@ -6284,7 +6283,7 @@ def get_nat_rule(self, network_firewall_policy_id, nat_rule_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'), @@ -6364,7 +6363,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}") @@ -6373,10 +6372,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 = { @@ -6384,7 +6383,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'), @@ -6462,7 +6461,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}") @@ -6471,10 +6470,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 = { @@ -6482,7 +6481,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'), @@ -6563,7 +6562,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}") @@ -6573,10 +6572,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 = { @@ -6584,7 +6583,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'), @@ -6673,7 +6672,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}") @@ -6683,24 +6682,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'), @@ -6783,7 +6782,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}") @@ -6793,10 +6792,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 = { @@ -6804,7 +6803,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'), @@ -6885,7 +6884,7 @@ def get_tunnel_inspection_rule(self, network_firewall_policy_id, tunnel_inspecti "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_inspection_rule got unknown kwargs: {extra_kwargs!r}") @@ -6895,10 +6894,10 @@ def get_tunnel_inspection_rule(self, network_firewall_policy_id, tunnel_inspecti "tunnelInspectionRuleName": tunnel_inspection_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 = { @@ -6906,7 +6905,7 @@ def get_tunnel_inspection_rule(self, network_firewall_policy_id, tunnel_inspecti "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -6997,10 +6996,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 = { @@ -7008,7 +7007,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'), @@ -7086,7 +7085,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}") @@ -7095,10 +7094,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 = { @@ -7106,7 +7105,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'), @@ -7208,7 +7207,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}") @@ -7217,10 +7216,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: @@ -7244,14 +7243,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'), @@ -7355,7 +7354,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}") @@ -7364,10 +7363,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: @@ -7391,14 +7390,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'), @@ -7502,7 +7501,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}") @@ -7511,10 +7510,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: @@ -7538,14 +7537,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'), @@ -7649,7 +7648,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}") @@ -7658,10 +7657,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: @@ -7685,14 +7684,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'), @@ -7800,7 +7799,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}") @@ -7809,10 +7808,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: @@ -7837,14 +7836,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'), @@ -7948,7 +7947,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}") @@ -7957,10 +7956,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: @@ -7984,14 +7983,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'), @@ -8099,7 +8098,7 @@ def list_nat_rules(self, network_firewall_policy_id, **kwargs): "display_name", "nat_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_nat_rules got unknown kwargs: {extra_kwargs!r}") @@ -8108,10 +8107,10 @@ def list_nat_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: @@ -8136,14 +8135,14 @@ def list_nat_rules(self, network_firewall_policy_id, **kwargs): "displayName": kwargs.get("display_name", missing), "natRulePriorityOrder": kwargs.get("nat_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'), @@ -8257,7 +8256,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}") @@ -8293,14 +8292,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'), @@ -8424,7 +8423,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}") @@ -8462,14 +8461,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'), @@ -8575,7 +8574,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}") @@ -8584,10 +8583,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: @@ -8612,14 +8611,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'), @@ -8723,7 +8722,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}") @@ -8732,10 +8731,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: @@ -8759,14 +8758,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'), @@ -8870,7 +8869,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}") @@ -8879,10 +8878,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: @@ -8906,14 +8905,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'), @@ -9021,7 +9020,7 @@ def list_tunnel_inspection_rules(self, network_firewall_policy_id, **kwargs): "display_name", "tunnel_inspection_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_tunnel_inspection_rules got unknown kwargs: {extra_kwargs!r}") @@ -9030,10 +9029,10 @@ def list_tunnel_inspection_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: @@ -9058,14 +9057,14 @@ def list_tunnel_inspection_rules(self, network_firewall_policy_id, **kwargs): "displayName": kwargs.get("display_name", missing), "tunnelInspectionRulePriorityOrder": kwargs.get("tunnel_inspection_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'), @@ -9169,7 +9168,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}") @@ -9178,10 +9177,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: @@ -9205,14 +9204,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'), @@ -9312,7 +9311,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}") @@ -9321,10 +9320,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: @@ -9347,14 +9346,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'), @@ -9454,7 +9453,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}") @@ -9463,10 +9462,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: @@ -9489,14 +9488,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'), @@ -9610,7 +9609,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}") @@ -9646,14 +9645,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'), @@ -9747,7 +9746,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}") @@ -9756,10 +9755,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 = { @@ -9769,7 +9768,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'), @@ -9860,7 +9859,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}") @@ -9870,10 +9869,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 = { @@ -9882,7 +9881,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'), @@ -9976,7 +9975,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}") @@ -9986,10 +9985,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 = { @@ -9998,7 +9997,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'), @@ -10092,7 +10091,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}") @@ -10102,10 +10101,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 = { @@ -10114,7 +10113,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'), @@ -10208,7 +10207,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}") @@ -10218,10 +10217,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 = { @@ -10230,7 +10229,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'), @@ -10324,7 +10323,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}") @@ -10334,10 +10333,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 = { @@ -10346,7 +10345,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'), @@ -10440,7 +10439,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}") @@ -10450,10 +10449,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 = { @@ -10462,7 +10461,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'), @@ -10556,7 +10555,7 @@ def update_nat_rule(self, network_firewall_policy_id, nat_rule_name, update_nat_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_rule got unknown kwargs: {extra_kwargs!r}") @@ -10566,10 +10565,10 @@ def update_nat_rule(self, network_firewall_policy_id, nat_rule_name, update_nat_ "natRuleName": nat_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 = { @@ -10578,7 +10577,7 @@ def update_nat_rule(self, network_firewall_policy_id, nat_rule_name, update_nat_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10671,7 +10670,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}") @@ -10680,10 +10679,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 = { @@ -10692,7 +10691,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'), @@ -10781,7 +10780,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}") @@ -10790,10 +10789,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 = { @@ -10802,7 +10801,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'), @@ -10894,7 +10893,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}") @@ -10904,10 +10903,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 = { @@ -10916,7 +10915,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'), @@ -11010,7 +11009,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}") @@ -11020,10 +11019,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 = { @@ -11032,7 +11031,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'), @@ -11126,7 +11125,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}") @@ -11136,10 +11135,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 = { @@ -11148,7 +11147,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'), @@ -11242,7 +11241,7 @@ def update_tunnel_inspection_rule(self, network_firewall_policy_id, tunnel_inspe "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_inspection_rule got unknown kwargs: {extra_kwargs!r}") @@ -11252,10 +11251,10 @@ def update_tunnel_inspection_rule(self, network_firewall_policy_id, tunnel_inspe "tunnelInspectionRuleName": tunnel_inspection_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 = { @@ -11264,7 +11263,7 @@ def update_tunnel_inspection_rule(self, network_firewall_policy_id, tunnel_inspe "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -11358,7 +11357,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}") @@ -11368,10 +11367,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 = { @@ -11380,7 +11379,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 4d49b13733..9c07cdb91b 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 @@ -185,7 +184,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}") @@ -194,10 +193,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 = { @@ -207,7 +206,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'), @@ -313,7 +312,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}") @@ -323,10 +322,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 = { @@ -336,7 +335,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'), @@ -437,7 +436,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}") @@ -446,10 +445,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 = { @@ -459,7 +458,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'), @@ -560,7 +559,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}") @@ -569,10 +568,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 = { @@ -582,7 +581,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'), @@ -670,7 +669,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}") @@ -681,7 +680,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'), @@ -784,7 +783,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}") @@ -795,10 +794,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 = { @@ -807,7 +806,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'), @@ -901,7 +900,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}") @@ -911,10 +910,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 = { @@ -923,7 +922,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'), @@ -1015,7 +1014,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}") @@ -1025,10 +1024,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 = { @@ -1037,7 +1036,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'), @@ -1124,7 +1123,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}") @@ -1133,10 +1132,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 = { @@ -1145,7 +1144,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'), @@ -1245,7 +1244,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}") @@ -1256,10 +1255,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 = { @@ -1268,7 +1267,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'), @@ -1362,7 +1361,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}") @@ -1373,10 +1372,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 = { @@ -1384,7 +1383,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'), @@ -1478,7 +1477,7 @@ def get_backend_operational_status(self, network_load_balancer_id, backend_set_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"get_backend_operational_status got unknown kwargs: {extra_kwargs!r}") @@ -1489,10 +1488,10 @@ def get_backend_operational_status(self, network_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 = { @@ -1500,7 +1499,7 @@ def get_backend_operational_status(self, network_load_balancer_id, backend_set_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'), @@ -1594,7 +1593,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}") @@ -1604,10 +1603,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 = { @@ -1616,7 +1615,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'), @@ -1702,7 +1701,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}") @@ -1712,10 +1711,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 = { @@ -1723,7 +1722,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'), @@ -1825,7 +1824,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}") @@ -1835,10 +1834,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 = { @@ -1848,7 +1847,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'), @@ -1943,7 +1942,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}") @@ -1953,10 +1952,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 = { @@ -1965,7 +1964,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'), @@ -2054,7 +2053,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}") @@ -2063,10 +2062,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 = { @@ -2075,7 +2074,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'), @@ -2156,7 +2155,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}") @@ -2165,10 +2164,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 = { @@ -2176,7 +2175,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'), @@ -2255,7 +2254,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}") @@ -2264,10 +2263,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 = { @@ -2275,7 +2274,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'), @@ -2392,7 +2391,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}") @@ -2401,10 +2400,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: @@ -2427,7 +2426,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", @@ -2435,7 +2434,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'), @@ -2559,7 +2558,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}") @@ -2569,10 +2568,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: @@ -2595,7 +2594,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", @@ -2603,7 +2602,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'), @@ -2722,7 +2721,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}") @@ -2731,10 +2730,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: @@ -2757,7 +2756,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", @@ -2765,7 +2764,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'), @@ -2876,7 +2875,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}") @@ -2902,14 +2901,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'), @@ -3028,7 +3027,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}") @@ -3063,14 +3062,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'), @@ -3174,7 +3173,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}") @@ -3199,14 +3198,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'), @@ -3311,7 +3310,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}") @@ -3336,14 +3335,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'), @@ -3442,7 +3441,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}") @@ -3451,10 +3450,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 = { @@ -3462,14 +3461,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'), @@ -3570,7 +3569,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}") @@ -3579,10 +3578,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 = { @@ -3590,14 +3589,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'), @@ -3695,7 +3694,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}") @@ -3705,14 +3704,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'), @@ -3825,7 +3824,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}") @@ -3836,10 +3835,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 = { @@ -3849,7 +3848,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'), @@ -3955,7 +3954,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}") @@ -3965,10 +3964,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 = { @@ -3978,7 +3977,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'), @@ -4084,7 +4083,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}") @@ -4094,10 +4093,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 = { @@ -4107,7 +4106,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'), @@ -4213,7 +4212,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}") @@ -4223,10 +4222,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 = { @@ -4236,7 +4235,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'), @@ -4329,7 +4328,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}") @@ -4338,10 +4337,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 = { @@ -4350,7 +4349,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'), @@ -4450,7 +4449,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}") @@ -4459,10 +4458,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 = { @@ -4472,7 +4471,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 e9b9298c61..b7df8fa91b 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 @@ -184,7 +183,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}") @@ -193,10 +192,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 = { @@ -206,7 +205,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'), @@ -298,7 +297,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}") @@ -307,10 +306,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 = { @@ -319,7 +318,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'), @@ -419,7 +418,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}") @@ -428,10 +427,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 = { @@ -441,7 +440,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'), @@ -530,7 +529,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}") @@ -541,7 +540,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'), @@ -639,7 +638,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}") @@ -649,17 +648,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", @@ -667,7 +666,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'), @@ -760,7 +759,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}") @@ -770,16 +769,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", @@ -787,7 +786,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'), @@ -890,7 +889,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}") @@ -899,10 +898,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 = { @@ -911,7 +910,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", @@ -919,7 +918,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'), @@ -1015,7 +1014,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}") @@ -1024,17 +1023,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", @@ -1042,7 +1041,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'), @@ -1126,7 +1125,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}") @@ -1135,10 +1134,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 = { @@ -1147,7 +1146,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'), @@ -1225,7 +1224,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}") @@ -1233,14 +1232,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'), @@ -1327,7 +1326,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}") @@ -1337,23 +1336,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'), @@ -1453,7 +1452,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}") @@ -1462,10 +1461,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: @@ -1481,14 +1480,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'), @@ -1574,7 +1573,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}") @@ -1583,23 +1582,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'), @@ -1679,7 +1678,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}") @@ -1688,10 +1687,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 = { @@ -1699,7 +1698,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'), @@ -1818,7 +1817,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}") @@ -1827,10 +1826,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: @@ -1863,14 +1862,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'), @@ -1976,7 +1975,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}") @@ -1985,10 +1984,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 = { @@ -1998,14 +1997,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'), @@ -2120,7 +2119,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}") @@ -2155,14 +2154,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'), @@ -2250,7 +2249,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}") @@ -2259,24 +2258,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'), @@ -2366,7 +2365,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}") @@ -2375,24 +2374,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'), @@ -2482,7 +2481,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}") @@ -2492,14 +2491,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'), @@ -2584,7 +2583,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}") @@ -2594,14 +2593,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'), @@ -2689,7 +2688,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}") @@ -2698,14 +2697,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'), @@ -2786,7 +2785,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}") @@ -2795,14 +2794,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'), @@ -2895,7 +2894,7 @@ def unassign_kms_key(self, compartment_id, **kwargs): "if_match", "is_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"unassign_kms_key got unknown kwargs: {extra_kwargs!r}") @@ -2903,7 +2902,7 @@ def unassign_kms_key(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", @@ -2912,7 +2911,7 @@ def unassign_kms_key(self, compartment_id, **kwargs): "if-match": kwargs.get("if_match", missing), "is-opc-dry-run": kwargs.get("is_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'), @@ -3005,7 +3004,7 @@ def update_configuration(self, compartment_id, update_configuration_details, **k "if_match", "is_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_configuration got unknown kwargs: {extra_kwargs!r}") @@ -3013,7 +3012,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", @@ -3022,7 +3021,7 @@ def update_configuration(self, compartment_id, update_configuration_details, **k "if-match": kwargs.get("if_match", missing), "is-opc-dry-run": kwargs.get("is_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'), @@ -3109,7 +3108,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}") @@ -3118,10 +3117,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 = { @@ -3130,7 +3129,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'), @@ -3220,7 +3219,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}") @@ -3229,10 +3228,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 = { @@ -3241,7 +3240,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 310eee633c..e023ec8589 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 @@ -175,7 +174,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}") @@ -186,23 +185,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'), @@ -287,7 +286,7 @@ def batch_delete_objects(self, namespace_name, bucket_name, batch_delete_objects "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"batch_delete_objects got unknown kwargs: {extra_kwargs!r}") @@ -297,10 +296,10 @@ def batch_delete_objects(self, namespace_name, bucket_name, batch_delete_objects "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 = { @@ -308,7 +307,7 @@ def batch_delete_objects(self, namespace_name, bucket_name, batch_delete_objects "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'), @@ -388,7 +387,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}") @@ -397,10 +396,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 = { @@ -408,7 +407,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'), @@ -509,7 +508,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}") @@ -520,16 +519,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", @@ -538,7 +537,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'), @@ -685,7 +684,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}") @@ -695,10 +694,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 = { @@ -713,7 +712,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'), @@ -795,7 +794,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}") @@ -804,10 +803,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 = { @@ -815,7 +814,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'), @@ -955,7 +954,7 @@ def create_multipart_upload(self, namespace_name, bucket_name, create_multipart_ "opc_sse_kms_key_id", "opc_checksum_algorithm" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -965,10 +964,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 = { @@ -983,7 +982,7 @@ def create_multipart_upload(self, namespace_name, bucket_name, create_multipart_ "opc-sse-kms-key-id": kwargs.get("opc_sse_kms_key_id", missing), "opc-checksum-algorithm": kwargs.get("opc_checksum_algorithm", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1070,7 +1069,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}") @@ -1080,10 +1079,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 = { @@ -1091,7 +1090,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'), @@ -1174,7 +1173,7 @@ def create_private_endpoint(self, namespace_name, create_private_endpoint_detail "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_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1183,10 +1182,10 @@ def create_private_endpoint(self, namespace_name, create_private_endpoint_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 = { @@ -1194,7 +1193,7 @@ def create_private_endpoint(self, namespace_name, create_private_endpoint_detail "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'), @@ -1279,7 +1278,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}") @@ -1289,10 +1288,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 = { @@ -1300,7 +1299,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'), @@ -1388,7 +1387,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}") @@ -1398,10 +1397,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 = { @@ -1409,7 +1408,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'), @@ -1502,7 +1501,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}") @@ -1512,10 +1511,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 = { @@ -1524,7 +1523,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'), @@ -1618,7 +1617,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}") @@ -1629,16 +1628,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", @@ -1646,7 +1645,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'), @@ -1734,7 +1733,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}") @@ -1744,10 +1743,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 = { @@ -1756,7 +1755,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'), @@ -1840,7 +1839,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}") @@ -1851,10 +1850,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 = { @@ -1862,7 +1861,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'), @@ -1948,7 +1947,7 @@ def delete_private_endpoint(self, namespace_name, pe_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_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -1958,10 +1957,10 @@ def delete_private_endpoint(self, namespace_name, pe_name, **kwargs): "peName": pe_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 delete_private_endpoint(self, namespace_name, pe_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'), @@ -2053,7 +2052,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}") @@ -2064,10 +2063,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 = { @@ -2075,7 +2074,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'), @@ -2164,7 +2163,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}") @@ -2175,10 +2174,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 = { @@ -2187,7 +2186,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'), @@ -2288,7 +2287,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}") @@ -2298,10 +2297,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: @@ -2315,7 +2314,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", @@ -2324,7 +2323,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'), @@ -2415,7 +2414,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}") @@ -2423,14 +2422,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'), @@ -2516,7 +2515,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}") @@ -2525,10 +2524,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 = { @@ -2536,7 +2535,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'), @@ -2692,7 +2691,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}") @@ -2703,10 +2702,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 = { @@ -2718,7 +2717,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", @@ -2731,7 +2730,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'), @@ -2815,7 +2814,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}") @@ -2825,10 +2824,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 = { @@ -2836,7 +2835,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'), @@ -2922,7 +2921,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}") @@ -2933,10 +2932,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 = { @@ -2944,7 +2943,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'), @@ -3038,7 +3037,7 @@ def get_private_endpoint(self, namespace_name, pe_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"get_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -3048,10 +3047,10 @@ def get_private_endpoint(self, namespace_name, pe_name, **kwargs): "peName": pe_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -3061,7 +3060,7 @@ def get_private_endpoint(self, namespace_name, pe_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'), @@ -3146,7 +3145,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}") @@ -3157,10 +3156,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 = { @@ -3168,7 +3167,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'), @@ -3253,7 +3252,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}") @@ -3264,10 +3263,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 = { @@ -3275,7 +3274,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'), @@ -3353,7 +3352,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}") @@ -3362,10 +3361,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 = { @@ -3373,7 +3372,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'), @@ -3467,7 +3466,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}") @@ -3477,10 +3476,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 = { @@ -3490,7 +3489,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'), @@ -3613,7 +3612,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}") @@ -3624,16 +3623,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", @@ -3645,7 +3644,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'), @@ -3758,7 +3757,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}") @@ -3767,10 +3766,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: @@ -3787,14 +3786,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'), @@ -3900,7 +3899,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}") @@ -3911,10 +3910,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 = { @@ -3922,14 +3921,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'), @@ -4028,7 +4027,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}") @@ -4038,24 +4037,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'), @@ -4197,7 +4196,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}") @@ -4207,10 +4206,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 = { @@ -4223,14 +4222,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'), @@ -4367,7 +4366,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}") @@ -4377,10 +4376,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 = { @@ -4392,14 +4391,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'), @@ -4502,7 +4501,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}") @@ -4512,10 +4511,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 = { @@ -4523,14 +4522,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'), @@ -4648,7 +4647,7 @@ def list_private_endpoints(self, namespace_name, compartment_id, **kwargs): "opc_client_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_private_endpoints got unknown kwargs: {extra_kwargs!r}") @@ -4657,10 +4656,10 @@ def list_private_endpoints(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: @@ -4685,14 +4684,14 @@ def list_private_endpoints(self, namespace_name, compartment_id, **kwargs): "fields": self.base_client.generate_collection_format_param(kwargs.get("fields", missing), 'csv'), "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-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'), @@ -4791,7 +4790,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}") @@ -4801,24 +4800,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'), @@ -4917,7 +4916,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}") @@ -4927,24 +4926,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'), @@ -5032,7 +5031,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}") @@ -5042,16 +5041,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", @@ -5151,7 +5150,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}") @@ -5160,24 +5159,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'), @@ -5272,7 +5271,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}") @@ -5281,24 +5280,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'), @@ -5397,7 +5396,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}") @@ -5408,14 +5407,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'), @@ -5500,7 +5499,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}") @@ -5510,10 +5509,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 = { @@ -5521,7 +5520,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'), @@ -5775,7 +5774,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}") @@ -5786,10 +5785,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 = { @@ -5816,9 +5815,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: @@ -5831,7 +5830,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.') @@ -5941,7 +5940,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}") @@ -5951,10 +5950,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 = { @@ -5964,7 +5963,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'), @@ -6062,7 +6061,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}") @@ -6072,10 +6071,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 = { @@ -6083,7 +6082,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'), @@ -6182,7 +6181,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}") @@ -6193,23 +6192,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'), @@ -6301,7 +6300,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}") @@ -6311,10 +6310,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 = { @@ -6322,7 +6321,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'), @@ -6408,7 +6407,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}") @@ -6418,10 +6417,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 = { @@ -6429,7 +6428,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'), @@ -6526,7 +6525,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}") @@ -6536,10 +6535,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 = { @@ -6548,7 +6547,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'), @@ -6637,7 +6636,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}") @@ -6646,10 +6645,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 = { @@ -6657,7 +6656,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'), @@ -6744,7 +6743,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}") @@ -6754,10 +6753,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 = { @@ -6765,7 +6764,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'), @@ -6865,7 +6864,7 @@ def update_private_endpoint(self, namespace_name, pe_name, update_private_endpoi "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"update_private_endpoint got unknown kwargs: {extra_kwargs!r}") @@ -6875,10 +6874,10 @@ def update_private_endpoint(self, namespace_name, pe_name, update_private_endpoi "peName": pe_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 update_private_endpoint(self, namespace_name, pe_name, update_private_endpoi "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'), @@ -6981,7 +6980,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}") @@ -6992,10 +6991,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 = { @@ -7004,7 +7003,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'), @@ -7209,7 +7208,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}") @@ -7220,17 +7219,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", @@ -7249,7 +7248,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: @@ -7262,7 +7261,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/download/DownloadManager.py b/src/oci/object_storage/transfer/internal/download/DownloadManager.py index 7fa3e20755..dc7f3a4dd1 100644 --- a/src/oci/object_storage/transfer/internal/download/DownloadManager.py +++ b/src/oci/object_storage/transfer/internal/download/DownloadManager.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 io -import six import math import time import warnings @@ -163,7 +162,7 @@ def get_object(self, "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}") @@ -255,7 +254,7 @@ def get_object_to_bytes(self, "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}") @@ -325,7 +324,7 @@ def get_object_to_text(self, "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}") @@ -485,7 +484,7 @@ def get_object_to_path(self, "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}") @@ -533,7 +532,7 @@ def get_object_to_stream(self, "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}") @@ -705,7 +704,7 @@ def __get_in_parts_to_stream(self, "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}") @@ -803,7 +802,7 @@ def resume_parts_to_path_multithread(self, namespace_name, bucket_name, object_n "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}") @@ -857,7 +856,7 @@ def resume_parts_to_stream_multithread(self, namespace_name, bucket_name, object "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}") diff --git a/src/oci/object_storage/transfer/internal/download/DownloadThread.py b/src/oci/object_storage/transfer/internal/download/DownloadThread.py index 7662eb7d5b..3ffc45a26a 100644 --- a/src/oci/object_storage/transfer/internal/download/DownloadThread.py +++ b/src/oci/object_storage/transfer/internal/download/DownloadThread.py @@ -2,7 +2,6 @@ # Copyright (c) 2016, 2025, 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. -import six import time import multiprocessing from enum import Enum @@ -180,7 +179,7 @@ def __init__(self, "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}") 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 8e50e39a7d..daf743619f 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__ @@ -405,7 +404,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: @@ -638,10 +637,8 @@ 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) semaphore.acquire() diff --git a/src/oci/oce/oce_instance_client.py b/src/oci/oce/oce_instance_client.py index 2b826faee3..8eb8256e9f 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 @@ -179,7 +178,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}") @@ -188,10 +187,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 = { @@ -201,7 +200,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'), @@ -288,7 +287,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}") @@ -299,7 +298,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'), @@ -384,7 +383,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}") @@ -393,10 +392,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 = { @@ -405,7 +404,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'), @@ -481,7 +480,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}") @@ -490,10 +489,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 = { @@ -501,7 +500,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'), @@ -579,7 +578,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}") @@ -588,10 +587,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 = { @@ -599,7 +598,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'), @@ -713,7 +712,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}") @@ -749,14 +748,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'), @@ -842,7 +841,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}") @@ -851,24 +850,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'), @@ -956,7 +955,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}") @@ -965,24 +964,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'), @@ -1074,7 +1073,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}") @@ -1085,14 +1084,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'), @@ -1181,7 +1180,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}") @@ -1190,10 +1189,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 = { @@ -1202,7 +1201,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 1014a6e00e..dd89964604 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 @@ -172,7 +171,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}") @@ -181,10 +180,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 = { @@ -192,14 +191,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'), @@ -288,7 +287,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}") @@ -298,14 +297,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'), @@ -394,7 +393,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}") @@ -403,14 +402,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 7336affa39..1c6c24512e 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 @@ -177,7 +176,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}") @@ -188,7 +187,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'), @@ -281,7 +280,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}") @@ -290,10 +289,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 = { @@ -302,7 +301,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'), @@ -381,7 +380,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}") @@ -390,10 +389,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 = { @@ -401,7 +400,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'), @@ -535,7 +534,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}") @@ -571,14 +570,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'), @@ -674,7 +673,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}") @@ -683,10 +682,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 = { @@ -695,7 +694,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/datastore_client.py b/src/oci/ocvp/datastore_client.py index b230648fa9..effce28b51 100644 --- a/src/oci/ocvp/datastore_client.py +++ b/src/oci/ocvp/datastore_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 add_block_volume_to_datastore(self, datastore_id, add_block_volume_to_datast "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_volume_to_datastore got unknown kwargs: {extra_kwargs!r}") @@ -195,10 +194,10 @@ def add_block_volume_to_datastore(self, datastore_id, add_block_volume_to_datast "datastoreId": datastore_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 add_block_volume_to_datastore(self, datastore_id, add_block_volume_to_datast "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 change_datastore_compartment(self, datastore_id, change_datastore_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_datastore_compartment got unknown kwargs: {extra_kwargs!r}") @@ -322,10 +321,10 @@ def change_datastore_compartment(self, datastore_id, change_datastore_compartmen "datastoreId": datastore_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -335,7 +334,7 @@ def change_datastore_compartment(self, datastore_id, change_datastore_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'), @@ -426,7 +425,7 @@ def create_datastore(self, create_datastore_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_datastore got unknown kwargs: {extra_kwargs!r}") @@ -437,7 +436,7 @@ def create_datastore(self, create_datastore_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'), @@ -528,7 +527,7 @@ def delete_datastore(self, datastore_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_datastore got unknown kwargs: {extra_kwargs!r}") @@ -537,10 +536,10 @@ def delete_datastore(self, datastore_id, **kwargs): "datastoreId": datastore_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -549,7 +548,7 @@ def delete_datastore(self, datastore_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 get_datastore(self, datastore_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_datastore got unknown kwargs: {extra_kwargs!r}") @@ -637,10 +636,10 @@ def get_datastore(self, datastore_id, **kwargs): "datastoreId": datastore_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -648,7 +647,7 @@ def get_datastore(self, datastore_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -788,7 +787,7 @@ def list_datastores(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_datastores got unknown kwargs: {extra_kwargs!r}") @@ -825,14 +824,14 @@ def list_datastores(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'), @@ -927,7 +926,7 @@ def update_datastore(self, datastore_id, update_datastore_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_datastore got unknown kwargs: {extra_kwargs!r}") @@ -936,10 +935,10 @@ def update_datastore(self, datastore_id, update_datastore_details, **kwargs): "datastoreId": datastore_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 update_datastore(self, datastore_id, update_datastore_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/datastore_cluster_client.py b/src/oci/ocvp/datastore_cluster_client.py index 92534698c1..28a60de5cb 100644 --- a/src/oci/ocvp/datastore_cluster_client.py +++ b/src/oci/ocvp/datastore_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 @@ -183,7 +182,7 @@ def add_datastore_to_datastore_cluster(self, datastore_cluster_id, add_datastore "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_datastore_to_datastore_cluster got unknown kwargs: {extra_kwargs!r}") @@ -192,10 +191,10 @@ def add_datastore_to_datastore_cluster(self, datastore_cluster_id, add_datastore "datastoreClusterId": datastore_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 = { @@ -205,7 +204,7 @@ def add_datastore_to_datastore_cluster(self, datastore_cluster_id, add_datastore "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 attach_datastore_cluster_to_cluster(self, datastore_cluster_id, attach_datas "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_datastore_cluster_to_cluster got unknown kwargs: {extra_kwargs!r}") @@ -318,10 +317,10 @@ def attach_datastore_cluster_to_cluster(self, datastore_cluster_id, attach_datas "datastoreClusterId": datastore_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 = { @@ -331,7 +330,7 @@ def attach_datastore_cluster_to_cluster(self, datastore_cluster_id, attach_datas "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 attach_datastore_cluster_to_esxi_host(self, datastore_cluster_id, attach_dat "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_datastore_cluster_to_esxi_host got unknown kwargs: {extra_kwargs!r}") @@ -444,10 +443,10 @@ def attach_datastore_cluster_to_esxi_host(self, datastore_cluster_id, attach_dat "datastoreClusterId": datastore_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 = { @@ -457,7 +456,7 @@ def attach_datastore_cluster_to_esxi_host(self, datastore_cluster_id, attach_dat "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -562,7 +561,7 @@ def change_datastore_cluster_compartment(self, datastore_cluster_id, change_data "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_datastore_cluster_compartment got unknown kwargs: {extra_kwargs!r}") @@ -571,10 +570,10 @@ def change_datastore_cluster_compartment(self, datastore_cluster_id, change_data "datastoreClusterId": datastore_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 = { @@ -584,7 +583,7 @@ def change_datastore_cluster_compartment(self, datastore_cluster_id, change_data "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 create_datastore_cluster(self, create_datastore_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_datastore_cluster got unknown kwargs: {extra_kwargs!r}") @@ -683,7 +682,7 @@ def create_datastore_cluster(self, create_datastore_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'), @@ -771,7 +770,7 @@ def delete_datastore_cluster(self, datastore_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_datastore_cluster got unknown kwargs: {extra_kwargs!r}") @@ -780,10 +779,10 @@ def delete_datastore_cluster(self, datastore_cluster_id, **kwargs): "datastoreClusterId": datastore_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 = { @@ -792,7 +791,7 @@ def delete_datastore_cluster(self, datastore_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'), @@ -890,7 +889,7 @@ def detach_datastore_cluster_from_cluster(self, datastore_cluster_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"detach_datastore_cluster_from_cluster got unknown kwargs: {extra_kwargs!r}") @@ -899,10 +898,10 @@ def detach_datastore_cluster_from_cluster(self, datastore_cluster_id, **kwargs): "datastoreClusterId": datastore_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 = { @@ -912,7 +911,7 @@ def detach_datastore_cluster_from_cluster(self, datastore_cluster_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'), @@ -1014,7 +1013,7 @@ def detach_datastore_cluster_from_esxi_host(self, datastore_cluster_id, detach_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"detach_datastore_cluster_from_esxi_host got unknown kwargs: {extra_kwargs!r}") @@ -1023,10 +1022,10 @@ def detach_datastore_cluster_from_esxi_host(self, datastore_cluster_id, detach_d "datastoreClusterId": datastore_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 = { @@ -1036,7 +1035,7 @@ def detach_datastore_cluster_from_esxi_host(self, datastore_cluster_id, detach_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'), @@ -1118,7 +1117,7 @@ def get_datastore_cluster(self, datastore_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_datastore_cluster got unknown kwargs: {extra_kwargs!r}") @@ -1127,10 +1126,10 @@ def get_datastore_cluster(self, datastore_cluster_id, **kwargs): "datastoreClusterId": datastore_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 = { @@ -1138,7 +1137,7 @@ def get_datastore_cluster(self, datastore_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'), @@ -1278,7 +1277,7 @@ def list_datastore_clusters(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_datastore_clusters got unknown kwargs: {extra_kwargs!r}") @@ -1315,14 +1314,14 @@ def list_datastore_clusters(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'), @@ -1422,7 +1421,7 @@ def remove_datastore_from_datastore_cluster(self, datastore_cluster_id, remove_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"remove_datastore_from_datastore_cluster got unknown kwargs: {extra_kwargs!r}") @@ -1431,10 +1430,10 @@ def remove_datastore_from_datastore_cluster(self, datastore_cluster_id, remove_d "datastoreClusterId": datastore_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 = { @@ -1444,7 +1443,7 @@ def remove_datastore_from_datastore_cluster(self, datastore_cluster_id, remove_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'), @@ -1540,7 +1539,7 @@ def update_datastore_cluster(self, datastore_cluster_id, update_datastore_cluste "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_datastore_cluster got unknown kwargs: {extra_kwargs!r}") @@ -1549,10 +1548,10 @@ def update_datastore_cluster(self, datastore_cluster_id, update_datastore_cluste "datastoreClusterId": datastore_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 = { @@ -1561,7 +1560,7 @@ def update_datastore_cluster(self, datastore_cluster_id, update_datastore_cluste "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 0d14848d0a..dcd19f5f75 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 @@ -175,7 +174,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}") @@ -186,7 +185,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'), @@ -287,7 +286,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}") @@ -296,10 +295,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 = { @@ -308,7 +307,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'), @@ -387,7 +386,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}") @@ -396,10 +395,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 = { @@ -407,7 +406,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'), @@ -504,7 +503,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}") @@ -513,10 +512,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 = { @@ -526,7 +525,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'), @@ -687,7 +686,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}") @@ -727,14 +726,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'), @@ -834,7 +833,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}") @@ -843,10 +842,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 = { @@ -856,7 +855,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'), @@ -959,7 +958,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}") @@ -968,16 +967,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", @@ -986,7 +985,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'), @@ -1079,7 +1078,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}") @@ -1088,10 +1087,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 = { @@ -1100,7 +1099,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 59dfcabedb..1fcd7fc9ac 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 @@ -180,7 +179,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}") @@ -189,10 +188,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 = { @@ -202,7 +201,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'), @@ -305,7 +304,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}") @@ -314,10 +313,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 = { @@ -327,7 +326,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'), @@ -422,7 +421,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}") @@ -433,7 +432,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'), @@ -526,7 +525,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}") @@ -535,10 +534,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 = { @@ -547,7 +546,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'), @@ -649,7 +648,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}") @@ -658,10 +657,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 = { @@ -671,7 +670,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'), @@ -753,7 +752,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}") @@ -762,10 +761,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 = { @@ -773,7 +772,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'), @@ -907,7 +906,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}") @@ -943,14 +942,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'), @@ -1051,7 +1050,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}") @@ -1062,14 +1061,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'), @@ -1178,7 +1177,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}") @@ -1191,14 +1190,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'), @@ -1308,7 +1307,7 @@ def list_supported_vmware_software_versions(self, compartment_id, **kwargs): "host_shape_name", "version_to_upgrade" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -1321,14 +1320,14 @@ def list_supported_vmware_software_versions(self, compartment_id, **kwargs): "hostShapeName": kwargs.get("host_shape_name", missing), "versionToUpgrade": kwargs.get("version_to_upgrade", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1425,7 +1424,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}") @@ -1434,10 +1433,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 = { @@ -1447,7 +1446,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'), @@ -1548,7 +1547,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}") @@ -1557,10 +1556,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"] @@ -1572,7 +1571,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", @@ -1581,7 +1580,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'), @@ -1681,7 +1680,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}") @@ -1690,10 +1689,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 = { @@ -1702,7 +1701,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'), @@ -1801,7 +1800,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}") @@ -1810,10 +1809,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 = { @@ -1823,7 +1822,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 236e468b17..7491c0e80e 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 @@ -164,7 +163,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}") @@ -173,10 +172,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 = { @@ -184,7 +183,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'), @@ -281,7 +280,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}") @@ -290,24 +289,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'), @@ -406,7 +405,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}") @@ -415,24 +414,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'), @@ -537,7 +536,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}") @@ -548,14 +547,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 8acb8f62fe..c2512fa58f 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 @@ -175,7 +174,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}") @@ -185,10 +184,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 = { @@ -197,7 +196,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'), @@ -297,7 +296,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}") @@ -307,10 +306,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 = { @@ -320,7 +319,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'), @@ -424,7 +423,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}") @@ -433,10 +432,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 = { @@ -446,7 +445,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'), @@ -528,7 +527,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}") @@ -537,10 +536,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 = { @@ -548,7 +547,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'), @@ -638,7 +637,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}") @@ -647,10 +646,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 = { @@ -659,7 +658,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'), @@ -752,7 +751,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}") @@ -761,10 +760,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 = { @@ -773,7 +772,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'), @@ -866,7 +865,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}") @@ -875,10 +874,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 = { @@ -887,7 +886,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'), @@ -978,7 +977,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}") @@ -989,7 +988,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'), @@ -1080,7 +1079,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}") @@ -1091,7 +1090,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'), @@ -1187,7 +1186,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}") @@ -1196,10 +1195,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 = { @@ -1208,7 +1207,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'), @@ -1301,7 +1300,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}") @@ -1310,10 +1309,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 = { @@ -1322,7 +1321,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'), @@ -1416,7 +1415,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}") @@ -1426,10 +1425,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 = { @@ -1438,7 +1437,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'), @@ -1531,7 +1530,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}") @@ -1540,10 +1539,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 = { @@ -1552,7 +1551,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'), @@ -1645,7 +1644,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}") @@ -1655,10 +1654,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 = { @@ -1667,7 +1666,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'), @@ -1755,7 +1754,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}") @@ -1765,10 +1764,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 = { @@ -1777,7 +1776,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'), @@ -1865,7 +1864,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}") @@ -1875,10 +1874,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 = { @@ -1887,7 +1886,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'), @@ -1975,7 +1974,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}") @@ -1984,10 +1983,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 = { @@ -1996,7 +1995,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'), @@ -2084,7 +2083,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}") @@ -2093,10 +2092,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 = { @@ -2105,7 +2104,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'), @@ -2196,7 +2195,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}") @@ -2206,10 +2205,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 = { @@ -2218,7 +2217,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'), @@ -2306,7 +2305,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}") @@ -2316,10 +2315,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 = { @@ -2328,7 +2327,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'), @@ -2419,7 +2418,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}") @@ -2430,10 +2429,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 = { @@ -2442,7 +2441,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'), @@ -2530,7 +2529,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}") @@ -2540,10 +2539,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 = { @@ -2552,7 +2551,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'), @@ -2634,7 +2633,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}") @@ -2644,10 +2643,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 = { @@ -2655,7 +2654,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'), @@ -2739,7 +2738,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}") @@ -2749,10 +2748,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 = { @@ -2760,7 +2759,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'), @@ -2847,7 +2846,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}") @@ -2857,10 +2856,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 = { @@ -2869,7 +2868,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'), @@ -2956,7 +2955,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}") @@ -2966,10 +2965,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 = { @@ -2978,7 +2977,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'), @@ -3065,7 +3064,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}") @@ -3075,10 +3074,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 = { @@ -3087,7 +3086,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'), @@ -3177,7 +3176,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}") @@ -3188,10 +3187,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 = { @@ -3200,7 +3199,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'), @@ -3280,7 +3279,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}") @@ -3289,10 +3288,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 = { @@ -3300,7 +3299,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'), @@ -3380,7 +3379,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}") @@ -3389,10 +3388,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 = { @@ -3400,7 +3399,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'), @@ -3483,7 +3482,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}") @@ -3493,10 +3492,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 = { @@ -3504,7 +3503,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'), @@ -3591,7 +3590,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}") @@ -3601,10 +3600,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 = { @@ -3613,7 +3612,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'), @@ -3703,7 +3702,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}") @@ -3714,10 +3713,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 = { @@ -3726,7 +3725,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'), @@ -3813,7 +3812,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}") @@ -3823,10 +3822,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 = { @@ -3835,7 +3834,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'), @@ -3925,7 +3924,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}") @@ -3934,10 +3933,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 = { @@ -3946,7 +3945,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'), @@ -4079,7 +4078,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}") @@ -4088,10 +4087,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: @@ -4132,14 +4131,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'), @@ -4278,7 +4277,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}") @@ -4287,10 +4286,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: @@ -4339,14 +4338,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'), @@ -4470,7 +4469,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}") @@ -4480,10 +4479,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: @@ -4515,14 +4514,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'), @@ -4674,7 +4673,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}") @@ -4683,10 +4682,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: @@ -4724,14 +4723,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'), @@ -4853,7 +4852,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}") @@ -4888,14 +4887,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'), @@ -5013,7 +5012,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}") @@ -5022,10 +5021,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: @@ -5056,14 +5055,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'), @@ -5187,7 +5186,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}") @@ -5222,14 +5221,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'), @@ -5351,7 +5350,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}") @@ -5361,10 +5360,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: @@ -5396,14 +5395,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'), @@ -5555,7 +5554,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}") @@ -5564,10 +5563,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: @@ -5605,14 +5604,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'), @@ -5746,7 +5745,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}") @@ -5755,10 +5754,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: @@ -5799,14 +5798,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'), @@ -5899,7 +5898,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}") @@ -5909,10 +5908,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 = { @@ -5921,7 +5920,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'), @@ -6012,7 +6011,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}") @@ -6022,10 +6021,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 = { @@ -6034,7 +6033,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'), @@ -6126,7 +6125,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}") @@ -6136,10 +6135,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 = { @@ -6148,7 +6147,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'), @@ -6238,7 +6237,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}") @@ -6248,10 +6247,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 = { @@ -6260,7 +6259,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'), @@ -6350,7 +6349,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}") @@ -6360,10 +6359,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 = { @@ -6372,7 +6371,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'), @@ -6474,7 +6473,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}") @@ -6484,10 +6483,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 = { @@ -6497,7 +6496,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'), @@ -6591,7 +6590,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}") @@ -6601,10 +6600,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 = { @@ -6613,7 +6612,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'), @@ -6708,7 +6707,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}") @@ -6718,10 +6717,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 = { @@ -6730,7 +6729,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'), @@ -6825,7 +6824,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}") @@ -6835,10 +6834,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 = { @@ -6847,7 +6846,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'), @@ -6945,7 +6944,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}") @@ -6956,10 +6955,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 = { @@ -6968,7 +6967,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'), @@ -7062,7 +7061,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}") @@ -7071,10 +7070,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 = { @@ -7083,7 +7082,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'), @@ -7176,7 +7175,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}") @@ -7186,10 +7185,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 = { @@ -7198,7 +7197,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'), @@ -7296,7 +7295,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}") @@ -7307,10 +7306,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 = { @@ -7319,7 +7318,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'), @@ -7414,7 +7413,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}") @@ -7424,10 +7423,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 = { @@ -7436,7 +7435,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 3957a36136..75d8443488 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 @@ -182,7 +181,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}") @@ -191,10 +190,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 = { @@ -204,7 +203,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'), @@ -295,7 +294,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}") @@ -306,7 +305,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'), @@ -400,7 +399,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}") @@ -409,10 +408,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 = { @@ -421,7 +420,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'), @@ -514,7 +513,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}") @@ -523,16 +522,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", @@ -540,7 +539,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'), @@ -630,7 +629,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}") @@ -640,10 +639,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 = { @@ -652,7 +651,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'), @@ -728,7 +727,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}") @@ -737,10 +736,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 = { @@ -748,7 +747,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'), @@ -833,7 +832,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}") @@ -843,23 +842,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'), @@ -942,7 +941,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}") @@ -951,10 +950,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 = { @@ -962,7 +961,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'), @@ -1076,7 +1075,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}") @@ -1085,10 +1084,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: @@ -1120,14 +1119,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'), @@ -1251,7 +1250,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}") @@ -1286,14 +1285,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'), @@ -1402,7 +1401,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}") @@ -1411,10 +1410,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: @@ -1437,14 +1436,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'), @@ -1555,7 +1554,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}") @@ -1564,10 +1563,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: @@ -1590,14 +1589,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'), @@ -1716,7 +1715,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}") @@ -1744,14 +1743,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'), @@ -1848,7 +1847,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}") @@ -1857,10 +1856,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 = { @@ -1870,7 +1869,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'), @@ -1967,7 +1966,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}") @@ -1976,10 +1975,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 = { @@ -1989,7 +1988,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'), @@ -2078,7 +2077,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}") @@ -2087,10 +2086,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 = { @@ -2099,7 +2098,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'), @@ -2194,7 +2193,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}") @@ -2204,10 +2203,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 = { @@ -2216,7 +2215,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 99c28f3ed1..39f0447a06 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 @@ -175,7 +174,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}") @@ -184,10 +183,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 = { @@ -196,7 +195,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'), @@ -301,7 +300,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}") @@ -311,10 +310,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 = { @@ -324,7 +323,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'), @@ -404,7 +403,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}") @@ -414,10 +413,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 = { @@ -425,7 +424,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'), @@ -506,7 +505,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}") @@ -516,10 +515,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 = { @@ -527,7 +526,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'), @@ -638,7 +637,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}") @@ -647,10 +646,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: @@ -674,14 +673,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'), @@ -826,7 +825,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}") @@ -857,14 +856,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'), @@ -973,7 +972,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}") @@ -983,16 +982,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", @@ -1001,7 +1000,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 895eb4c3d8..18b44cef84 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 @@ -190,7 +189,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}") @@ -218,14 +217,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 ad17f9ed71..13c03d0267 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 @@ -160,7 +159,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}") @@ -169,10 +168,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 = { @@ -180,7 +179,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'), @@ -281,7 +280,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}") @@ -308,14 +307,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 e1566b7bae..af516691af 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 @@ -170,7 +169,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}") @@ -179,24 +178,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'), @@ -303,7 +302,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}") @@ -325,14 +324,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'), @@ -447,7 +446,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}") @@ -478,14 +477,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 5fcea928d0..476d9050cb 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 @@ -192,7 +191,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}") @@ -220,14 +219,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'), @@ -343,7 +342,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}") @@ -373,14 +372,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 f740a61c55..f3e49d68fe 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 @@ -182,7 +181,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}") @@ -208,14 +207,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 d70ab953da..2ce9a74dc7 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 @@ -198,7 +197,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}") @@ -228,14 +227,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 a556bcae5d..71ad6e4174 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 @@ -172,7 +171,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}") @@ -181,23 +180,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'), @@ -308,7 +307,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}") @@ -337,14 +336,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 e71a3e8d33..ea4a6dd46e 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 @@ -201,7 +200,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}") @@ -231,14 +230,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 675a4adf37..4007b53cdf 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 @@ -187,7 +186,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}") @@ -196,10 +195,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 = { @@ -209,7 +208,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'), @@ -312,7 +311,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}") @@ -323,7 +322,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'), @@ -411,7 +410,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}") @@ -420,10 +419,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 = { @@ -432,7 +431,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'), @@ -511,7 +510,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}") @@ -520,10 +519,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 = { @@ -531,7 +530,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'), @@ -652,7 +651,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}") @@ -688,14 +687,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'), @@ -785,7 +784,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}") @@ -794,10 +793,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 = { @@ -806,7 +805,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 e42ba92c09..ccb07a4eaa 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 @@ -187,7 +186,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}") @@ -196,10 +195,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 = { @@ -209,7 +208,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'), @@ -301,7 +300,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}") @@ -312,7 +311,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'), @@ -400,7 +399,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}") @@ -409,10 +408,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 = { @@ -421,7 +420,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'), @@ -520,7 +519,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}") @@ -529,24 +528,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'), @@ -629,7 +628,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}") @@ -638,10 +637,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 = { @@ -649,7 +648,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'), @@ -750,7 +749,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}") @@ -759,24 +758,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'), @@ -877,7 +876,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}") @@ -888,14 +887,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'), @@ -1008,7 +1007,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}") @@ -1017,10 +1016,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 = { @@ -1029,7 +1028,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'), @@ -1112,7 +1111,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}") @@ -1121,10 +1120,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 = { @@ -1132,7 +1131,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'), @@ -1222,7 +1221,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}") @@ -1231,10 +1230,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 = { @@ -1243,7 +1242,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 1efffd1239..f6899c3f64 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 @@ -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'), @@ -276,7 +275,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}") @@ -285,10 +284,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 = { @@ -297,7 +296,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'), @@ -383,7 +382,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}") @@ -394,7 +393,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'), @@ -479,7 +478,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}") @@ -488,10 +487,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 = { @@ -500,7 +499,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'), @@ -576,7 +575,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}") @@ -585,10 +584,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 = { @@ -596,7 +595,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'), @@ -674,7 +673,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}") @@ -683,10 +682,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 = { @@ -694,7 +693,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'), @@ -807,7 +806,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}") @@ -843,14 +842,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'), @@ -948,7 +947,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}") @@ -957,10 +956,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: @@ -983,14 +982,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'), @@ -1090,7 +1089,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}") @@ -1099,10 +1098,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: @@ -1125,14 +1124,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'), @@ -1247,7 +1246,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}") @@ -1283,14 +1282,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'), @@ -1376,7 +1375,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}") @@ -1385,10 +1384,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 = { @@ -1397,7 +1396,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'), @@ -1481,7 +1480,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}") @@ -1490,10 +1489,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 = { @@ -1502,7 +1501,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'), @@ -1589,7 +1588,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}") @@ -1598,10 +1597,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 = { @@ -1610,7 +1609,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 ac6bb9f979..470be2574f 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 @@ -168,7 +167,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}") @@ -177,10 +176,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 = { @@ -189,7 +188,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'), @@ -263,7 +262,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}") @@ -272,10 +271,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 = { @@ -283,7 +282,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'), @@ -397,7 +396,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}") @@ -434,14 +433,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'), @@ -528,7 +527,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}") @@ -537,10 +536,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 = { @@ -549,7 +548,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 50b97ee227..a4e4c6afde 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 @@ -179,7 +178,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}") @@ -188,10 +187,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 = { @@ -201,7 +200,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'), @@ -297,7 +296,7 @@ def configure_outbound_cluster(self, opensearch_cluster_id, configure_outbound_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"configure_outbound_cluster got unknown kwargs: {extra_kwargs!r}") @@ -306,10 +305,10 @@ def configure_outbound_cluster(self, opensearch_cluster_id, configure_outbound_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 = { @@ -319,7 +318,7 @@ def configure_outbound_cluster(self, opensearch_cluster_id, configure_outbound_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'), @@ -404,7 +403,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}") @@ -415,7 +414,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'), @@ -498,7 +497,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}") @@ -507,10 +506,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 = { @@ -519,7 +518,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'), @@ -593,7 +592,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}") @@ -602,10 +601,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 = { @@ -613,7 +612,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'), @@ -689,7 +688,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}") @@ -698,10 +697,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 = { @@ -709,7 +708,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'), @@ -777,7 +776,7 @@ def list_opensearch_cluster_shapes(self, compartment_id, **kwargs): api_reference_link = "https://docs.oracle.com/iaas/api/#/en/opensearch/20180828/ShapesDetails/ListOpensearchClusterShapes" 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_opensearch_cluster_shapes got unknown kwargs: {extra_kwargs!r}") @@ -785,7 +784,7 @@ def list_opensearch_cluster_shapes(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", @@ -900,7 +899,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}") @@ -936,14 +935,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'), @@ -1023,7 +1022,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}") @@ -1033,7 +1032,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", @@ -1122,7 +1121,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}") @@ -1131,24 +1130,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'), @@ -1234,7 +1233,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}") @@ -1243,24 +1242,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'), @@ -1354,7 +1353,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}") @@ -1366,14 +1365,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'), @@ -1468,7 +1467,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}") @@ -1477,10 +1476,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 = { @@ -1490,7 +1489,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'), @@ -1586,7 +1585,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}") @@ -1595,10 +1594,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 = { @@ -1608,7 +1607,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'), @@ -1704,7 +1703,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}") @@ -1713,10 +1712,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 = { @@ -1726,7 +1725,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'), @@ -1814,7 +1813,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}") @@ -1823,10 +1822,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 = { @@ -1835,7 +1834,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'), @@ -1930,7 +1929,7 @@ def upgrade_open_search_cluster(self, opensearch_cluster_id, upgrade_open_search "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_open_search_cluster got unknown kwargs: {extra_kwargs!r}") @@ -1939,10 +1938,10 @@ def upgrade_open_search_cluster(self, opensearch_cluster_id, upgrade_open_search "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 = { @@ -1952,7 +1951,7 @@ def upgrade_open_search_cluster(self, opensearch_cluster_id, upgrade_open_search "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_pipeline_client.py b/src/oci/opensearch/opensearch_cluster_pipeline_client.py index 1804ee6a1a..4b8d7e25db 100644 --- a/src/oci/opensearch/opensearch_cluster_pipeline_client.py +++ b/src/oci/opensearch/opensearch_cluster_pipeline_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_opensearch_cluster_pipeline(self, create_opensearch_cluster_pipeline_ "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_opensearch_cluster_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -185,7 +184,7 @@ def create_opensearch_cluster_pipeline(self, create_opensearch_cluster_pipeline_ "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'), @@ -268,7 +267,7 @@ def delete_opensearch_cluster_pipeline(self, opensearch_cluster_pipeline_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_opensearch_cluster_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -277,10 +276,10 @@ def delete_opensearch_cluster_pipeline(self, opensearch_cluster_pipeline_id, **k "opensearchClusterPipelineId": opensearch_cluster_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 = { @@ -289,7 +288,7 @@ def delete_opensearch_cluster_pipeline(self, opensearch_cluster_pipeline_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'), @@ -363,7 +362,7 @@ def get_opensearch_cluster_pipeline(self, opensearch_cluster_pipeline_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_opensearch_cluster_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -372,10 +371,10 @@ def get_opensearch_cluster_pipeline(self, opensearch_cluster_pipeline_id, **kwar "opensearchClusterPipelineId": opensearch_cluster_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 = { @@ -383,7 +382,7 @@ def get_opensearch_cluster_pipeline(self, opensearch_cluster_pipeline_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'), @@ -497,7 +496,7 @@ def list_opensearch_cluster_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_opensearch_cluster_pipelines got unknown kwargs: {extra_kwargs!r}") @@ -534,14 +533,14 @@ def list_opensearch_cluster_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'), @@ -633,7 +632,7 @@ def update_opensearch_cluster_pipeline(self, opensearch_cluster_pipeline_id, upd "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_opensearch_cluster_pipeline got unknown kwargs: {extra_kwargs!r}") @@ -642,10 +641,10 @@ def update_opensearch_cluster_pipeline(self, opensearch_cluster_pipeline_id, upd "opensearchClusterPipelineId": opensearch_cluster_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 = { @@ -655,7 +654,7 @@ def update_opensearch_cluster_pipeline(self, opensearch_cluster_pipeline_id, upd "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'), diff --git a/src/oci/operator_access_control/access_requests_client.py b/src/oci/operator_access_control/access_requests_client.py index b93d4fdeca..8e74d23e85 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 @@ -182,7 +181,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}") @@ -191,10 +190,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 = { @@ -204,7 +203,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'), @@ -283,7 +282,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}") @@ -292,10 +291,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 = { @@ -303,7 +302,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'), @@ -385,7 +384,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}") @@ -394,23 +393,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'), @@ -509,7 +508,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}") @@ -518,10 +517,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 = { @@ -531,7 +530,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'), @@ -620,7 +619,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}") @@ -629,24 +628,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'), @@ -772,7 +771,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}") @@ -810,14 +809,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'), @@ -903,7 +902,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}") @@ -912,24 +911,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'), @@ -1028,7 +1027,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}") @@ -1037,10 +1036,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 = { @@ -1050,7 +1049,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'), @@ -1148,7 +1147,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}") @@ -1157,10 +1156,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 = { @@ -1170,7 +1169,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'), @@ -1270,7 +1269,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}") @@ -1279,10 +1278,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 = { @@ -1292,7 +1291,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 06289c25e1..dc90c1c1fb 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 @@ -163,7 +162,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}") @@ -172,10 +171,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 = { @@ -183,7 +182,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'), @@ -295,7 +294,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}") @@ -331,14 +330,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 5f7191e9d5..aba7662ab8 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 @@ -182,7 +181,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}") @@ -191,10 +190,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 = { @@ -204,7 +203,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'), @@ -291,7 +290,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}") @@ -302,7 +301,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'), @@ -393,7 +392,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}") @@ -402,16 +401,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", @@ -419,7 +418,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'), @@ -497,7 +496,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}") @@ -506,10 +505,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 = { @@ -517,7 +516,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'), @@ -595,7 +594,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}") @@ -604,10 +603,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 = { @@ -615,7 +614,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'), @@ -731,7 +730,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}") @@ -768,14 +767,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'), @@ -864,7 +863,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}") @@ -873,10 +872,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 = { @@ -885,7 +884,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'), @@ -984,7 +983,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}") @@ -993,10 +992,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 = { @@ -1006,7 +1005,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 67e29c19e3..26eb3dc5d8 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 @@ -182,7 +181,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}") @@ -191,10 +190,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 = { @@ -204,7 +203,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'), @@ -291,7 +290,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}") @@ -302,7 +301,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'), @@ -397,7 +396,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}") @@ -406,16 +405,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", @@ -423,7 +422,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'), @@ -501,7 +500,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}") @@ -510,10 +509,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 = { @@ -521,7 +520,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'), @@ -633,7 +632,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}") @@ -669,14 +668,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'), @@ -765,7 +764,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}") @@ -774,10 +773,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 = { @@ -786,7 +785,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 5dc964826a..c8babce191 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 @@ -182,7 +181,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}") @@ -191,10 +190,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 = { @@ -204,7 +203,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'), @@ -302,7 +301,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}") @@ -311,10 +310,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 = { @@ -324,7 +323,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'), @@ -422,7 +421,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}") @@ -431,10 +430,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 = { @@ -444,7 +443,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'), @@ -542,7 +541,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}") @@ -551,10 +550,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 = { @@ -564,7 +563,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'), @@ -653,7 +652,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}") @@ -662,10 +661,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 = { @@ -674,7 +673,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'), @@ -771,7 +770,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}") @@ -780,10 +779,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 = { @@ -793,7 +792,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'), @@ -891,7 +890,7 @@ def change_external_mysql_database_insight_connection(self, database_insight_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_external_mysql_database_insight_connection got unknown kwargs: {extra_kwargs!r}") @@ -900,10 +899,10 @@ def change_external_mysql_database_insight_connection(self, database_insight_id, "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 = { @@ -913,7 +912,7 @@ def change_external_mysql_database_insight_connection(self, database_insight_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'), @@ -1011,7 +1010,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}") @@ -1020,10 +1019,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 = { @@ -1033,7 +1032,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'), @@ -1131,7 +1130,7 @@ def change_macs_managed_autonomous_database_insight_connection(self, database_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"change_macs_managed_autonomous_database_insight_connection got unknown kwargs: {extra_kwargs!r}") @@ -1140,10 +1139,10 @@ def change_macs_managed_autonomous_database_insight_connection(self, database_in "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 = { @@ -1153,7 +1152,7 @@ def change_macs_managed_autonomous_database_insight_connection(self, database_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'), @@ -1251,7 +1250,7 @@ def change_macs_managed_cloud_database_insight_connection(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"change_macs_managed_cloud_database_insight_connection got unknown kwargs: {extra_kwargs!r}") @@ -1260,10 +1259,10 @@ def change_macs_managed_cloud_database_insight_connection(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 = { @@ -1273,7 +1272,7 @@ def change_macs_managed_cloud_database_insight_connection(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'), @@ -1371,7 +1370,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}") @@ -1380,10 +1379,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 = { @@ -1393,7 +1392,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'), @@ -1493,7 +1492,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}") @@ -1502,10 +1501,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 = { @@ -1515,7 +1514,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'), @@ -1613,7 +1612,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}") @@ -1622,10 +1621,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 = { @@ -1635,7 +1634,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'), @@ -1735,7 +1734,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}") @@ -1744,10 +1743,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 = { @@ -1757,7 +1756,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'), @@ -1855,7 +1854,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}") @@ -1864,10 +1863,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 = { @@ -1877,7 +1876,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'), @@ -1967,7 +1966,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}") @@ -1978,7 +1977,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'), @@ -2067,7 +2066,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}") @@ -2078,7 +2077,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'), @@ -2167,7 +2166,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}") @@ -2178,7 +2177,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'), @@ -2267,7 +2266,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}") @@ -2278,7 +2277,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'), @@ -2367,7 +2366,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}") @@ -2378,7 +2377,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'), @@ -2467,7 +2466,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}") @@ -2478,7 +2477,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'), @@ -2567,7 +2566,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}") @@ -2578,7 +2577,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'), @@ -2668,7 +2667,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}") @@ -2679,7 +2678,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'), @@ -2770,7 +2769,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}") @@ -2781,7 +2780,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'), @@ -2871,7 +2870,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}") @@ -2882,7 +2881,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'), @@ -2994,7 +2993,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}") @@ -3029,7 +3028,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", @@ -3037,7 +3036,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'), @@ -3125,7 +3124,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}") @@ -3134,10 +3133,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 = { @@ -3146,7 +3145,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'), @@ -3232,7 +3231,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}") @@ -3242,10 +3241,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 = { @@ -3254,7 +3253,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'), @@ -3337,7 +3336,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}") @@ -3346,10 +3345,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 = { @@ -3358,7 +3357,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'), @@ -3441,7 +3440,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}") @@ -3450,10 +3449,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 = { @@ -3462,7 +3461,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'), @@ -3545,7 +3544,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}") @@ -3554,10 +3553,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 = { @@ -3566,7 +3565,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'), @@ -3649,7 +3648,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}") @@ -3658,10 +3657,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 = { @@ -3670,7 +3669,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'), @@ -3753,7 +3752,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}") @@ -3762,10 +3761,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 = { @@ -3774,7 +3773,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'), @@ -3857,7 +3856,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}") @@ -3866,10 +3865,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 = { @@ -3878,7 +3877,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'), @@ -3963,7 +3962,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}") @@ -3972,10 +3971,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 = { @@ -3984,7 +3983,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'), @@ -4070,7 +4069,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}") @@ -4079,10 +4078,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 = { @@ -4091,7 +4090,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'), @@ -4174,7 +4173,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}") @@ -4183,10 +4182,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 = { @@ -4195,7 +4194,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'), @@ -4280,7 +4279,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}") @@ -4289,10 +4288,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 = { @@ -4301,7 +4300,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'), @@ -4393,7 +4392,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}") @@ -4402,10 +4401,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 = { @@ -4415,7 +4414,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'), @@ -4508,7 +4507,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}") @@ -4517,10 +4516,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 = { @@ -4530,7 +4529,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'), @@ -4623,7 +4622,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}") @@ -4632,10 +4631,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 = { @@ -4645,7 +4644,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'), @@ -4738,7 +4737,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}") @@ -4747,10 +4746,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 = { @@ -4760,7 +4759,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'), @@ -4853,7 +4852,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}") @@ -4862,10 +4861,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 = { @@ -4875,7 +4874,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'), @@ -4965,7 +4964,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}") @@ -4974,10 +4973,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 = { @@ -4986,7 +4985,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'), @@ -5086,7 +5085,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}") @@ -5095,10 +5094,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 = { @@ -5108,7 +5107,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'), @@ -5203,7 +5202,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}") @@ -5212,10 +5211,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 = { @@ -5225,7 +5224,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'), @@ -5321,7 +5320,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}") @@ -5330,10 +5329,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 = { @@ -5343,7 +5342,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'), @@ -5441,7 +5440,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}") @@ -5450,10 +5449,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 = { @@ -5463,7 +5462,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'), @@ -5561,7 +5560,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}") @@ -5570,10 +5569,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 = { @@ -5583,7 +5582,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'), @@ -5702,7 +5701,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}") @@ -5711,10 +5710,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: @@ -5741,14 +5740,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'), @@ -5865,7 +5864,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}") @@ -5874,10 +5873,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: @@ -5897,14 +5896,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'), @@ -5985,7 +5984,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}") @@ -5994,10 +5993,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 = { @@ -6005,7 +6004,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'), @@ -6087,7 +6086,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}") @@ -6097,10 +6096,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 = { @@ -6108,7 +6107,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'), @@ -6187,7 +6186,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}") @@ -6196,10 +6195,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 = { @@ -6207,7 +6206,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'), @@ -6316,7 +6315,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}") @@ -6325,10 +6324,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: @@ -6347,14 +6346,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'), @@ -6435,7 +6434,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}") @@ -6444,10 +6443,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 = { @@ -6455,7 +6454,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'), @@ -6534,7 +6533,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}") @@ -6543,10 +6542,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 = { @@ -6554,7 +6553,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'), @@ -6633,7 +6632,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}") @@ -6642,10 +6641,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 = { @@ -6653,7 +6652,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'), @@ -6732,7 +6731,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}") @@ -6741,10 +6740,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 = { @@ -6752,7 +6751,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'), @@ -6831,7 +6830,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}") @@ -6840,10 +6839,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 = { @@ -6851,7 +6850,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'), @@ -6932,7 +6931,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}") @@ -6941,10 +6940,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 = { @@ -6952,7 +6951,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'), @@ -7032,7 +7031,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}") @@ -7041,10 +7040,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 = { @@ -7052,7 +7051,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'), @@ -7131,7 +7130,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}") @@ -7140,10 +7139,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 = { @@ -7151,7 +7150,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'), @@ -7257,7 +7256,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}") @@ -7266,10 +7265,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: @@ -7302,14 +7301,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'), @@ -7395,7 +7394,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}") @@ -7404,23 +7403,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'), @@ -7501,7 +7500,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}") @@ -7510,10 +7509,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 = { @@ -7521,7 +7520,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'), @@ -7603,7 +7602,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}") @@ -7613,10 +7612,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 = { @@ -7624,7 +7623,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'), @@ -7729,7 +7728,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}") @@ -7738,7 +7737,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", @@ -7747,7 +7746,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'), @@ -7856,7 +7855,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}") @@ -7865,7 +7864,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", @@ -7874,7 +7873,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'), @@ -7976,7 +7975,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}") @@ -7984,7 +7983,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", @@ -7993,7 +7992,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'), @@ -8095,7 +8094,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}") @@ -8103,7 +8102,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", @@ -8112,7 +8111,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'), @@ -8222,7 +8221,7 @@ def ingest_my_sql_sql_stats(self, ingest_my_sql_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_my_sql_sql_stats got unknown kwargs: {extra_kwargs!r}") @@ -8231,7 +8230,7 @@ def ingest_my_sql_sql_stats(self, ingest_my_sql_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", @@ -8240,7 +8239,7 @@ def ingest_my_sql_sql_stats(self, ingest_my_sql_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'), @@ -8357,7 +8356,7 @@ def ingest_my_sql_sql_text(self, ingest_my_sql_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_my_sql_sql_text got unknown kwargs: {extra_kwargs!r}") @@ -8367,7 +8366,7 @@ def ingest_my_sql_sql_text(self, ingest_my_sql_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", @@ -8376,7 +8375,7 @@ def ingest_my_sql_sql_text(self, ingest_my_sql_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'), @@ -8492,7 +8491,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}") @@ -8502,7 +8501,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", @@ -8511,7 +8510,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'), @@ -8627,7 +8626,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}") @@ -8637,7 +8636,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", @@ -8646,7 +8645,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'), @@ -8756,7 +8755,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}") @@ -8765,7 +8764,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", @@ -8774,7 +8773,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'), @@ -8891,7 +8890,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}") @@ -8901,7 +8900,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", @@ -8910,7 +8909,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'), @@ -9069,7 +9068,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}") @@ -9102,14 +9101,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'), @@ -9288,7 +9287,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}") @@ -9325,14 +9324,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'), @@ -9488,7 +9487,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}") @@ -9521,14 +9520,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'), @@ -9684,7 +9683,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}") @@ -9717,14 +9716,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'), @@ -9923,7 +9922,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}") @@ -9964,14 +9963,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'), @@ -10142,7 +10141,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}") @@ -10177,14 +10176,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'), @@ -10320,7 +10319,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}") @@ -10329,10 +10328,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: @@ -10361,14 +10360,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'), @@ -10491,7 +10490,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}") @@ -10500,10 +10499,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: @@ -10529,14 +10528,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'), @@ -10668,7 +10667,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}") @@ -10677,10 +10676,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: @@ -10700,14 +10699,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'), @@ -10851,7 +10850,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}") @@ -10907,14 +10906,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'), @@ -11043,7 +11042,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}") @@ -11081,14 +11080,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'), @@ -11209,7 +11208,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}") @@ -11218,10 +11217,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: @@ -11247,14 +11246,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'), @@ -11443,7 +11442,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}") @@ -11490,14 +11489,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'), @@ -11665,7 +11664,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}") @@ -11733,14 +11732,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'), @@ -11871,7 +11870,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}") @@ -11909,14 +11908,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'), @@ -12072,7 +12071,7 @@ def list_exadata_configurations(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_configurations got unknown kwargs: {extra_kwargs!r}") @@ -12105,14 +12104,14 @@ def list_exadata_configurations(self, **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'), @@ -12256,7 +12255,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}") @@ -12304,14 +12303,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'), @@ -12503,7 +12502,7 @@ def list_host_configurations(self, **kwargs): "vmcluster_name", "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_host_configurations got unknown kwargs: {extra_kwargs!r}") @@ -12558,14 +12557,14 @@ def list_host_configurations(self, **kwargs): "vmclusterName": self.base_client.generate_collection_format_param(kwargs.get("vmcluster_name", missing), 'multi'), "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'), @@ -12724,7 +12723,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}") @@ -12782,14 +12781,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'), @@ -12959,7 +12958,7 @@ def list_hosted_entities(self, compartment_id, id, **kwargs): "host_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_hosted_entities got unknown kwargs: {extra_kwargs!r}") @@ -13010,14 +13009,14 @@ def list_hosted_entities(self, compartment_id, id, **kwargs): "hostId": kwargs.get("host_id", 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'), @@ -13132,7 +13131,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}") @@ -13158,14 +13157,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'), @@ -13282,7 +13281,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}") @@ -13308,14 +13307,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'), @@ -13424,7 +13423,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}") @@ -13433,10 +13432,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 = { @@ -13446,14 +13445,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'), @@ -13587,7 +13586,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}") @@ -13633,14 +13632,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'), @@ -13780,7 +13779,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}") @@ -13820,14 +13819,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'), @@ -13956,7 +13955,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}") @@ -13994,14 +13993,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'), @@ -14128,7 +14127,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}") @@ -14165,14 +14164,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'), @@ -14299,7 +14298,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}") @@ -14344,14 +14343,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'), @@ -14480,7 +14479,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}") @@ -14518,14 +14517,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'), @@ -14635,7 +14634,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}") @@ -14648,14 +14647,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'), @@ -14804,7 +14803,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}") @@ -14822,14 +14821,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'), @@ -14967,7 +14966,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}") @@ -14984,14 +14983,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'), @@ -15127,7 +15126,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}") @@ -15137,10 +15136,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: @@ -15183,14 +15182,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'), @@ -15301,7 +15300,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}") @@ -15310,10 +15309,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: @@ -15336,14 +15335,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'), @@ -15454,7 +15453,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}") @@ -15463,10 +15462,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: @@ -15489,14 +15488,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'), @@ -15628,7 +15627,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}") @@ -15665,14 +15664,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'), @@ -15771,7 +15770,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}") @@ -15781,10 +15780,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 = { @@ -15792,7 +15791,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: @@ -15801,7 +15800,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.') @@ -15918,7 +15917,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}") @@ -15928,14 +15927,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'), @@ -16045,7 +16044,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}") @@ -16055,24 +16054,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'), @@ -16161,7 +16160,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}") @@ -16170,10 +16169,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 = { @@ -16182,7 +16181,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'), @@ -16359,7 +16358,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}") @@ -16396,14 +16395,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'), @@ -16589,7 +16588,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}") @@ -16627,14 +16626,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'), @@ -16844,7 +16843,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}") @@ -16906,14 +16905,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'), @@ -17116,7 +17115,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}") @@ -17158,14 +17157,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'), @@ -17327,7 +17326,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}") @@ -17347,14 +17346,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'), @@ -17517,7 +17516,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}") @@ -17537,14 +17536,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'), @@ -17690,7 +17689,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}") @@ -17699,10 +17698,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: @@ -17739,14 +17738,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'), @@ -17887,7 +17886,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}") @@ -17896,10 +17895,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: @@ -17929,14 +17928,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'), @@ -18081,7 +18080,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}") @@ -18090,10 +18089,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: @@ -18123,14 +18122,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'), @@ -18304,7 +18303,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}") @@ -18313,10 +18312,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: @@ -18371,14 +18370,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'), @@ -18501,7 +18500,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}") @@ -18510,10 +18509,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: @@ -18539,14 +18538,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'), @@ -18687,7 +18686,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}") @@ -18696,10 +18695,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: @@ -18729,14 +18728,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'), @@ -18866,7 +18865,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}") @@ -18875,10 +18874,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: @@ -18914,14 +18913,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'), @@ -19074,7 +19073,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}") @@ -19083,10 +19082,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: @@ -19119,14 +19118,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'), @@ -19274,7 +19273,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}") @@ -19283,10 +19282,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: @@ -19324,14 +19323,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'), @@ -19452,7 +19451,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}") @@ -19461,10 +19460,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: @@ -19489,14 +19488,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'), @@ -19619,7 +19618,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}") @@ -19648,14 +19647,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'), @@ -19882,7 +19881,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}") @@ -19943,14 +19942,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'), @@ -20192,7 +20191,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}") @@ -20255,14 +20254,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'), @@ -20498,7 +20497,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}") @@ -20554,14 +20553,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'), @@ -20759,7 +20758,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}") @@ -20794,14 +20793,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'), @@ -21006,7 +21005,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}") @@ -21056,14 +21055,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'), @@ -21267,7 +21266,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}") @@ -21304,14 +21303,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'), @@ -21446,7 +21445,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}") @@ -21461,14 +21460,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'), @@ -21651,7 +21650,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}") @@ -21689,14 +21688,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'), @@ -21884,7 +21883,7 @@ def summarize_exadata_insight_resource_capacity_trend_aggregated(self, resource_ "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"summarize_exadata_insight_resource_capacity_trend_aggregated got unknown kwargs: {extra_kwargs!r}") @@ -21923,14 +21922,14 @@ def summarize_exadata_insight_resource_capacity_trend_aggregated(self, resource_ "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'), @@ -22139,7 +22138,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}") @@ -22195,14 +22194,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'), @@ -22409,7 +22408,7 @@ def summarize_exadata_insight_resource_forecast_trend_aggregated(self, resource_ "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"summarize_exadata_insight_resource_forecast_trend_aggregated got unknown kwargs: {extra_kwargs!r}") @@ -22451,14 +22450,14 @@ def summarize_exadata_insight_resource_forecast_trend_aggregated(self, resource_ "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'), @@ -22620,7 +22619,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}") @@ -22655,14 +22654,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'), @@ -22864,7 +22863,7 @@ def summarize_exadata_insight_resource_usage(self, compartment_id, resource_type "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"summarize_exadata_insight_resource_usage got unknown kwargs: {extra_kwargs!r}") @@ -22905,14 +22904,14 @@ def summarize_exadata_insight_resource_usage(self, compartment_id, resource_type "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'), @@ -23092,7 +23091,7 @@ def summarize_exadata_insight_resource_usage_aggregated(self, compartment_id, re "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"summarize_exadata_insight_resource_usage_aggregated got unknown kwargs: {extra_kwargs!r}") @@ -23116,14 +23115,14 @@ def summarize_exadata_insight_resource_usage_aggregated(self, compartment_id, re "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'), @@ -23320,7 +23319,7 @@ def summarize_exadata_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_exadata_insight_resource_utilization_insight got unknown kwargs: {extra_kwargs!r}") @@ -23348,14 +23347,14 @@ def summarize_exadata_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'), @@ -23471,7 +23470,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}") @@ -23498,14 +23497,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'), @@ -23631,7 +23630,7 @@ def summarize_host_insight_disk_statistics(self, compartment_id, id, **kwargs): "opc_request_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"summarize_host_insight_disk_statistics got unknown kwargs: {extra_kwargs!r}") @@ -23661,14 +23660,14 @@ def summarize_host_insight_disk_statistics(self, compartment_id, id, **kwargs): "statistic": kwargs.get("statistic", 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'), @@ -23802,7 +23801,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}") @@ -23825,14 +23824,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'), @@ -23976,7 +23975,7 @@ def summarize_host_insight_io_usage_trend(self, compartment_id, id, **kwargs): "opc_request_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"summarize_host_insight_io_usage_trend got unknown kwargs: {extra_kwargs!r}") @@ -24008,14 +24007,14 @@ def summarize_host_insight_io_usage_trend(self, compartment_id, id, **kwargs): "statistic": kwargs.get("statistic", 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'), @@ -24159,7 +24158,7 @@ def summarize_host_insight_network_usage_trend(self, compartment_id, id, **kwarg "opc_request_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"summarize_host_insight_network_usage_trend got unknown kwargs: {extra_kwargs!r}") @@ -24191,14 +24190,14 @@ def summarize_host_insight_network_usage_trend(self, compartment_id, id, **kwarg "statistic": kwargs.get("statistic", 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'), @@ -24420,7 +24419,7 @@ def summarize_host_insight_resource_capacity_trend(self, compartment_id, resourc "low_utilization_threshold", "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_host_insight_resource_capacity_trend got unknown kwargs: {extra_kwargs!r}") @@ -24487,14 +24486,14 @@ def summarize_host_insight_resource_capacity_trend(self, compartment_id, resourc "lowUtilizationThreshold": kwargs.get("low_utilization_threshold", 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'), @@ -24743,7 +24742,7 @@ def summarize_host_insight_resource_forecast_trend(self, compartment_id, resourc "gpu_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"summarize_host_insight_resource_forecast_trend got unknown kwargs: {extra_kwargs!r}") @@ -24815,14 +24814,14 @@ def summarize_host_insight_resource_forecast_trend(self, compartment_id, resourc "gpuId": kwargs.get("gpu_id", 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'), @@ -25057,7 +25056,7 @@ def summarize_host_insight_resource_statistics(self, compartment_id, resource_me "low_utilization_threshold", "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_host_insight_resource_statistics got unknown kwargs: {extra_kwargs!r}") @@ -25120,14 +25119,14 @@ def summarize_host_insight_resource_statistics(self, compartment_id, resource_me "lowUtilizationThreshold": kwargs.get("low_utilization_threshold", 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'), @@ -25324,7 +25323,7 @@ def summarize_host_insight_resource_usage(self, compartment_id, resource_metric, "vmcluster_name", "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_host_insight_resource_usage got unknown kwargs: {extra_kwargs!r}") @@ -25366,14 +25365,14 @@ def summarize_host_insight_resource_usage(self, compartment_id, resource_metric, "vmclusterName": self.base_client.generate_collection_format_param(kwargs.get("vmcluster_name", missing), 'multi'), "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'), @@ -25577,7 +25576,7 @@ def summarize_host_insight_resource_usage_trend(self, compartment_id, resource_m "vmcluster_name", "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_host_insight_resource_usage_trend got unknown kwargs: {extra_kwargs!r}") @@ -25634,14 +25633,14 @@ def summarize_host_insight_resource_usage_trend(self, compartment_id, resource_m "vmclusterName": self.base_client.generate_collection_format_param(kwargs.get("vmcluster_name", missing), 'multi'), "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'), @@ -25844,7 +25843,7 @@ def summarize_host_insight_resource_utilization_insight(self, compartment_id, re "low_utilization_threshold", "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_host_insight_resource_utilization_insight got unknown kwargs: {extra_kwargs!r}") @@ -25888,14 +25887,14 @@ def summarize_host_insight_resource_utilization_insight(self, compartment_id, re "lowUtilizationThreshold": kwargs.get("low_utilization_threshold", 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'), @@ -26039,7 +26038,7 @@ def summarize_host_insight_storage_usage_trend(self, compartment_id, id, **kwarg "opc_request_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"summarize_host_insight_storage_usage_trend got unknown kwargs: {extra_kwargs!r}") @@ -26071,14 +26070,14 @@ def summarize_host_insight_storage_usage_trend(self, compartment_id, id, **kwarg "statistic": kwargs.get("statistic", 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'), @@ -26237,7 +26236,7 @@ def summarize_host_insight_top_processes_usage(self, compartment_id, id, resourc "statistic", "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_host_insight_top_processes_usage got unknown kwargs: {extra_kwargs!r}") @@ -26272,14 +26271,14 @@ def summarize_host_insight_top_processes_usage(self, compartment_id, id, resourc "statistic": kwargs.get("statistic", 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'), @@ -26438,7 +26437,7 @@ def summarize_host_insight_top_processes_usage_trend(self, compartment_id, id, r "statistic", "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_host_insight_top_processes_usage_trend got unknown kwargs: {extra_kwargs!r}") @@ -26473,14 +26472,14 @@ def summarize_host_insight_top_processes_usage_trend(self, compartment_id, id, r "statistic": kwargs.get("statistic", 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'), @@ -26560,7 +26559,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}") @@ -26569,10 +26568,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 = { @@ -26580,7 +26579,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'), @@ -26766,7 +26765,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}") @@ -26799,14 +26798,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'), @@ -26934,7 +26933,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}") @@ -26949,14 +26948,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'), @@ -27084,7 +27083,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}") @@ -27099,14 +27098,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'), @@ -27326,7 +27325,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}") @@ -27386,14 +27385,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'), @@ -27572,7 +27571,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}") @@ -27596,14 +27595,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'), @@ -27731,7 +27730,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}") @@ -27746,14 +27745,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'), @@ -27872,7 +27871,7 @@ def synchronize_autonomous_database_to_exadata(self, compartment_id, synchronize "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_autonomous_database_to_exadata got unknown kwargs: {extra_kwargs!r}") @@ -27883,7 +27882,7 @@ def synchronize_autonomous_database_to_exadata(self, compartment_id, synchronize "id": kwargs.get("id", missing), "exadataInsightId": kwargs.get("exadata_insight_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", @@ -27892,7 +27891,7 @@ def synchronize_autonomous_database_to_exadata(self, compartment_id, synchronize "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -27993,7 +27992,7 @@ def test_macs_managed_autonomous_database_insight_connection(self, test_macs_man "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_macs_managed_autonomous_database_insight_connection got unknown kwargs: {extra_kwargs!r}") @@ -28002,7 +28001,7 @@ def test_macs_managed_autonomous_database_insight_connection(self, test_macs_man "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", @@ -28010,7 +28009,7 @@ def test_macs_managed_autonomous_database_insight_connection(self, test_macs_man "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -28111,7 +28110,7 @@ def test_macs_managed_cloud_database_insight_connection(self, test_macs_managed_ "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_macs_managed_cloud_database_insight_connection got unknown kwargs: {extra_kwargs!r}") @@ -28120,7 +28119,7 @@ def test_macs_managed_cloud_database_insight_connection(self, test_macs_managed_ "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", @@ -28128,7 +28127,7 @@ def test_macs_managed_cloud_database_insight_connection(self, test_macs_managed_ "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -28217,7 +28216,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}") @@ -28226,10 +28225,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 = { @@ -28238,7 +28237,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'), @@ -28326,7 +28325,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}") @@ -28335,10 +28334,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 = { @@ -28347,7 +28346,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'), @@ -28435,7 +28434,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}") @@ -28444,10 +28443,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 = { @@ -28456,7 +28455,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'), @@ -28544,7 +28543,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}") @@ -28553,10 +28552,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 = { @@ -28565,7 +28564,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'), @@ -28653,7 +28652,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}") @@ -28662,10 +28661,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 = { @@ -28674,7 +28673,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'), @@ -28762,7 +28761,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}") @@ -28771,10 +28770,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 = { @@ -28783,7 +28782,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'), @@ -28871,7 +28870,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}") @@ -28880,10 +28879,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 = { @@ -28892,7 +28891,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'), @@ -28982,7 +28981,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}") @@ -28991,10 +28990,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 = { @@ -29003,7 +29002,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'), @@ -29092,7 +29091,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}") @@ -29101,10 +29100,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 = { @@ -29113,7 +29112,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'), @@ -29201,7 +29200,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}") @@ -29210,10 +29209,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 = { @@ -29222,7 +29221,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'), @@ -29312,7 +29311,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}") @@ -29321,10 +29320,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 = { @@ -29333,7 +29332,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 7d52e04b79..b1bb1dafb4 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 @@ -174,7 +173,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}") @@ -183,10 +182,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 = { @@ -195,7 +194,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'), @@ -283,7 +282,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}") @@ -294,7 +293,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'), @@ -382,7 +381,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}") @@ -391,10 +390,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 = { @@ -403,7 +402,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'), @@ -538,7 +537,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}") @@ -554,14 +553,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'), @@ -642,7 +641,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}") @@ -651,10 +650,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 = { @@ -662,7 +661,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'), @@ -741,7 +740,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}") @@ -750,10 +749,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 = { @@ -761,7 +760,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'), @@ -840,7 +839,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}") @@ -849,10 +848,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 = { @@ -860,7 +859,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'), @@ -939,7 +938,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}") @@ -948,10 +947,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 = { @@ -959,7 +958,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'), @@ -1042,7 +1041,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}") @@ -1051,23 +1050,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'), @@ -1148,7 +1147,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}") @@ -1157,10 +1156,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 = { @@ -1168,7 +1167,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'), @@ -1312,7 +1311,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}") @@ -1350,14 +1349,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'), @@ -1468,7 +1467,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}") @@ -1510,14 +1509,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'), @@ -1654,7 +1653,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}") @@ -1702,14 +1701,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'), @@ -1821,7 +1820,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}") @@ -1850,14 +1849,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'), @@ -1966,7 +1965,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}") @@ -2001,14 +2000,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'), @@ -2120,7 +2119,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}") @@ -2149,14 +2148,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'), @@ -2314,7 +2313,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}") @@ -2362,14 +2361,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'), @@ -2461,7 +2460,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}") @@ -2472,14 +2471,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'), @@ -2645,7 +2644,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}") @@ -2695,14 +2694,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'), @@ -2789,7 +2788,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}") @@ -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'), @@ -2904,7 +2903,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}") @@ -2913,24 +2912,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'), @@ -3019,7 +3018,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}") @@ -3029,14 +3028,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'), @@ -3126,7 +3125,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}") @@ -3135,10 +3134,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 = { @@ -3147,7 +3146,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'), @@ -3239,7 +3238,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}") @@ -3248,10 +3247,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 = { @@ -3260,7 +3259,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'), @@ -3357,7 +3356,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}") @@ -3366,10 +3365,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 = { @@ -3378,7 +3377,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'), @@ -3473,7 +3472,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}") @@ -3482,10 +3481,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 = { @@ -3494,7 +3493,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_hub/event_client.py b/src/oci/os_management_hub/event_client.py index 2e76b272b0..eb787437fe 100644 --- a/src/oci/os_management_hub/event_client.py +++ b/src/oci/os_management_hub/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 @@ -185,7 +184,7 @@ def change_event_compartment(self, change_event_compartment_details, event_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_event_compartment got unknown kwargs: {extra_kwargs!r}") @@ -194,10 +193,10 @@ def change_event_compartment(self, change_event_compartment_details, event_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') header_params = { @@ -207,7 +206,7 @@ def change_event_compartment(self, change_event_compartment_details, event_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'), @@ -296,7 +295,7 @@ def delete_event(self, event_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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 got unknown kwargs: {extra_kwargs!r}") @@ -305,10 +304,10 @@ def delete_event(self, event_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') header_params = { @@ -317,7 +316,7 @@ def delete_event(self, event_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 delete_event_content(self, event_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_event_content got unknown kwargs: {extra_kwargs!r}") @@ -420,10 +419,10 @@ def delete_event_content(self, event_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') header_params = { @@ -433,7 +432,7 @@ def delete_event_content(self, event_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'), @@ -512,7 +511,7 @@ def get_event(self, event_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -521,10 +520,10 @@ def get_event(self, event_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') header_params = { @@ -532,7 +531,7 @@ def get_event(self, event_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -612,7 +611,7 @@ def get_event_content(self, event_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -621,10 +620,10 @@ def get_event_content(self, event_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') header_params = { @@ -632,7 +631,7 @@ def get_event_content(self, event_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -728,7 +727,7 @@ def import_event_content(self, event_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"import_event_content got unknown kwargs: {extra_kwargs!r}") @@ -737,10 +736,10 @@ def import_event_content(self, event_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') header_params = { @@ -750,7 +749,7 @@ def import_event_content(self, event_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'), @@ -908,7 +907,7 @@ def list_events(self, **kwargs): "opc_request_id", "is_managed_by_autonomous_linux" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -959,14 +958,14 @@ def list_events(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "isManagedByAutonomousLinux": kwargs.get("is_managed_by_autonomous_linux", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 update_event(self, event_id, update_event_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_event got unknown kwargs: {extra_kwargs!r}") @@ -1066,10 +1065,10 @@ def update_event(self, event_id, update_event_details, **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') header_params = { @@ -1078,7 +1077,7 @@ def update_event(self, event_id, update_event_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/lifecycle_environment_client.py b/src/oci/os_management_hub/lifecycle_environment_client.py index e9dcd9d5ef..ded61dc68a 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 @@ -182,7 +181,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}") @@ -191,10 +190,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 = { @@ -204,7 +203,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'), @@ -308,7 +307,7 @@ def change_lifecycle_environment_compartment(self, lifecycle_environment_id, cha "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_lifecycle_environment_compartment got unknown kwargs: {extra_kwargs!r}") @@ -317,10 +316,10 @@ def change_lifecycle_environment_compartment(self, lifecycle_environment_id, cha "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 = { @@ -330,7 +329,7 @@ def change_lifecycle_environment_compartment(self, lifecycle_environment_id, cha "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 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}") @@ -428,7 +427,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'), @@ -517,7 +516,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}") @@ -526,10 +525,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 = { @@ -538,7 +537,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'), @@ -635,7 +634,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}") @@ -644,10 +643,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 = { @@ -657,7 +656,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'), @@ -738,7 +737,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}") @@ -747,10 +746,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 = { @@ -758,7 +757,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'), @@ -838,7 +837,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}") @@ -847,10 +846,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 = { @@ -858,7 +857,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'), @@ -1013,7 +1012,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}") @@ -1084,14 +1083,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'), @@ -1221,7 +1220,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}") @@ -1230,10 +1229,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: @@ -1267,14 +1266,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'), @@ -1438,7 +1437,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}") @@ -1510,14 +1509,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'), @@ -1624,7 +1623,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}") @@ -1633,16 +1632,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", @@ -1651,7 +1650,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'), @@ -1753,7 +1752,7 @@ def reboot_lifecycle_stage(self, lifecycle_stage_id, reboot_lifecycle_stage_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"reboot_lifecycle_stage got unknown kwargs: {extra_kwargs!r}") @@ -1762,10 +1761,10 @@ def reboot_lifecycle_stage(self, lifecycle_stage_id, reboot_lifecycle_stage_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 = { @@ -1775,7 +1774,7 @@ def reboot_lifecycle_stage(self, lifecycle_stage_id, reboot_lifecycle_stage_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'), @@ -1867,7 +1866,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}") @@ -1876,10 +1875,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 = { @@ -1888,7 +1887,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 fee4a54616..6c053d4ef9 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 @@ -184,7 +183,7 @@ def associate_managed_instances_with_management_station(self, management_station "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_managed_instances_with_management_station got unknown kwargs: {extra_kwargs!r}") @@ -193,10 +192,10 @@ def associate_managed_instances_with_management_station(self, management_station "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 = { @@ -206,7 +205,7 @@ def associate_managed_instances_with_management_station(self, management_station "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'), @@ -307,7 +306,7 @@ def attach_profile_to_managed_instance(self, managed_instance_id, attach_profile "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_profile_to_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -316,10 +315,10 @@ def attach_profile_to_managed_instance(self, managed_instance_id, attach_profile "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 = { @@ -329,7 +328,7 @@ def attach_profile_to_managed_instance(self, managed_instance_id, attach_profile "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -430,7 +429,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}") @@ -439,10 +438,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 = { @@ -452,7 +451,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'), @@ -542,7 +541,7 @@ def delete_managed_instance(self, managed_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_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -551,10 +550,10 @@ def delete_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 = { @@ -563,7 +562,7 @@ def delete_managed_instance(self, managed_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'), @@ -658,7 +657,7 @@ def detach_profile_from_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"detach_profile_from_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -667,10 +666,10 @@ def detach_profile_from_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 = { @@ -680,7 +679,7 @@ def detach_profile_from_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'), @@ -779,7 +778,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}") @@ -788,10 +787,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 = { @@ -801,7 +800,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'), @@ -904,7 +903,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}") @@ -913,10 +912,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 = { @@ -926,7 +925,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'), @@ -1030,7 +1029,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}") @@ -1039,10 +1038,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 = { @@ -1052,7 +1051,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'), @@ -1133,7 +1132,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}") @@ -1142,10 +1141,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 = { @@ -1153,7 +1152,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'), @@ -1232,7 +1231,7 @@ def get_windows_update(self, windows_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_windows_update got unknown kwargs: {extra_kwargs!r}") @@ -1241,10 +1240,10 @@ def get_windows_update(self, windows_update_id, **kwargs): "windowsUpdateId": windows_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 = { @@ -1252,7 +1251,7 @@ def get_windows_update(self, windows_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'), @@ -1346,7 +1345,7 @@ def install_all_windows_updates_on_managed_instances_in_compartment(self, instal "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_all_windows_updates_on_managed_instances_in_compartment got unknown kwargs: {extra_kwargs!r}") @@ -1358,7 +1357,7 @@ def install_all_windows_updates_on_managed_instances_in_compartment(self, instal "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'), @@ -1458,7 +1457,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}") @@ -1467,10 +1466,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 = { @@ -1480,7 +1479,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'), @@ -1580,7 +1579,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}") @@ -1589,10 +1588,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 = { @@ -1602,7 +1601,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'), @@ -1702,7 +1701,7 @@ def install_windows_updates_on_managed_instance(self, managed_instance_id, insta "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_updates_on_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -1711,10 +1710,10 @@ def install_windows_updates_on_managed_instance(self, managed_instance_id, insta "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 = { @@ -1724,7 +1723,7 @@ def install_windows_updates_on_managed_instance(self, managed_instance_id, insta "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -1847,7 +1846,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}") @@ -1856,10 +1855,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: @@ -1885,14 +1884,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'), @@ -2016,7 +2015,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}") @@ -2025,10 +2024,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: @@ -2054,14 +2053,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'), @@ -2202,7 +2201,7 @@ def list_managed_instance_available_windows_updates(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_windows_updates got unknown kwargs: {extra_kwargs!r}") @@ -2211,10 +2210,10 @@ def list_managed_instance_available_windows_updates(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 'classification_type' in kwargs: @@ -2258,14 +2257,14 @@ def list_managed_instance_available_windows_updates(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'), @@ -2397,7 +2396,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}") @@ -2406,10 +2405,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 'classification_type' in kwargs: @@ -2444,14 +2443,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'), @@ -2587,7 +2586,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}") @@ -2596,10 +2595,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: @@ -2627,14 +2626,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'), @@ -2763,7 +2762,7 @@ def list_managed_instance_installed_windows_updates(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_installed_windows_updates got unknown kwargs: {extra_kwargs!r}") @@ -2772,10 +2771,10 @@ def list_managed_instance_installed_windows_updates(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: @@ -2802,14 +2801,14 @@ def list_managed_instance_installed_windows_updates(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'), @@ -2933,7 +2932,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}") @@ -2942,10 +2941,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: @@ -2971,14 +2970,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'), @@ -3114,7 +3113,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}") @@ -3123,10 +3122,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: @@ -3162,14 +3161,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'), @@ -3408,7 +3407,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}") @@ -3500,14 +3499,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'), @@ -3632,7 +3631,7 @@ def list_windows_updates(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_windows_updates got unknown kwargs: {extra_kwargs!r}") @@ -3669,14 +3668,14 @@ def list_windows_updates(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'), @@ -3778,7 +3777,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}") @@ -3787,10 +3786,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 = { @@ -3800,7 +3799,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'), @@ -3902,7 +3901,7 @@ def reboot_managed_instance(self, managed_instance_id, reboot_managed_instance_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"reboot_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -3911,10 +3910,10 @@ def reboot_managed_instance(self, managed_instance_id, reboot_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 = { @@ -3924,7 +3923,7 @@ def reboot_managed_instance(self, managed_instance_id, reboot_managed_instance_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'), @@ -4021,7 +4020,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}") @@ -4030,10 +4029,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 = { @@ -4043,7 +4042,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'), @@ -4143,7 +4142,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}") @@ -4152,10 +4151,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 = { @@ -4165,7 +4164,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'), @@ -4265,7 +4264,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}") @@ -4274,10 +4273,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 = { @@ -4287,7 +4286,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'), @@ -4390,7 +4389,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}") @@ -4399,10 +4398,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 = { @@ -4412,7 +4411,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'), @@ -4507,7 +4506,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}") @@ -4519,7 +4518,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'), @@ -4609,7 +4608,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}") @@ -4618,10 +4617,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 = { @@ -4630,7 +4629,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'), @@ -4731,7 +4730,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}") @@ -4740,10 +4739,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 = { @@ -4753,7 +4752,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 6f65bb42b6..04d6d81cb3 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 @@ -184,7 +183,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}") @@ -193,10 +192,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 = { @@ -206,7 +205,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'), @@ -308,7 +307,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}") @@ -317,10 +316,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 = { @@ -330,7 +329,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'), @@ -434,7 +433,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}") @@ -443,10 +442,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 = { @@ -456,7 +455,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'), @@ -543,7 +542,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}") @@ -554,7 +553,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'), @@ -643,7 +642,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}") @@ -652,10 +651,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 = { @@ -664,7 +663,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'), @@ -763,7 +762,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}") @@ -772,10 +771,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 = { @@ -785,7 +784,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'), @@ -887,7 +886,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}") @@ -896,10 +895,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 = { @@ -909,7 +908,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'), @@ -1009,7 +1008,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}") @@ -1018,10 +1017,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 = { @@ -1031,7 +1030,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'), @@ -1131,7 +1130,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}") @@ -1140,10 +1139,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 = { @@ -1153,7 +1152,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'), @@ -1234,7 +1233,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}") @@ -1243,10 +1242,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 = { @@ -1254,7 +1253,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'), @@ -1353,7 +1352,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}") @@ -1362,10 +1361,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 = { @@ -1375,7 +1374,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'), @@ -1475,7 +1474,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}") @@ -1484,10 +1483,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 = { @@ -1497,7 +1496,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'), @@ -1597,7 +1596,7 @@ def install_windows_updates_on_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"install_windows_updates_on_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -1606,10 +1605,10 @@ def install_windows_updates_on_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 = { @@ -1619,7 +1618,7 @@ def install_windows_updates_on_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'), @@ -1742,7 +1741,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}") @@ -1751,10 +1750,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: @@ -1780,14 +1779,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'), @@ -1916,7 +1915,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}") @@ -1925,10 +1924,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: @@ -1955,14 +1954,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'), @@ -2086,7 +2085,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}") @@ -2095,10 +2094,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: @@ -2124,14 +2123,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'), @@ -2268,7 +2267,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}") @@ -2277,10 +2276,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: @@ -2308,14 +2307,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'), @@ -2463,7 +2462,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}") @@ -2472,10 +2471,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: @@ -2502,14 +2501,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'), @@ -2676,7 +2675,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}") @@ -2749,14 +2748,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'), @@ -2856,7 +2855,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}") @@ -2865,10 +2864,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 = { @@ -2878,7 +2877,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'), @@ -2978,7 +2977,7 @@ def reboot_managed_instance_group(self, managed_instance_group_id, reboot_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"reboot_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -2987,10 +2986,10 @@ def reboot_managed_instance_group(self, managed_instance_group_id, reboot_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 = { @@ -3000,7 +2999,7 @@ def reboot_managed_instance_group(self, managed_instance_group_id, reboot_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'), @@ -3100,7 +3099,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}") @@ -3109,10 +3108,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 = { @@ -3122,7 +3121,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'), @@ -3222,7 +3221,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}") @@ -3231,10 +3230,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 = { @@ -3244,7 +3243,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'), @@ -3347,7 +3346,7 @@ def switch_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"switch_module_stream_on_managed_instance_group got unknown kwargs: {extra_kwargs!r}") @@ -3356,10 +3355,10 @@ def switch_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 = { @@ -3369,7 +3368,7 @@ def switch_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'), @@ -3469,7 +3468,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}") @@ -3478,10 +3477,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 = { @@ -3491,7 +3490,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'), @@ -3583,7 +3582,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}") @@ -3592,10 +3591,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 = { @@ -3604,7 +3603,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 d91afe68ec..9af6c7446b 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 @@ -184,7 +183,7 @@ def change_management_station_compartment(self, management_station_id, change_ma "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_management_station_compartment got unknown kwargs: {extra_kwargs!r}") @@ -193,10 +192,10 @@ def change_management_station_compartment(self, management_station_id, change_ma "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 = { @@ -206,7 +205,7 @@ def change_management_station_compartment(self, management_station_id, change_ma "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'), @@ -293,7 +292,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}") @@ -304,7 +303,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'), @@ -403,7 +402,7 @@ def delete_management_station(self, management_station_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_management_station got unknown kwargs: {extra_kwargs!r}") @@ -412,10 +411,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 = { @@ -425,7 +424,7 @@ def delete_management_station(self, management_station_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'), @@ -504,7 +503,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}") @@ -513,10 +512,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 = { @@ -524,7 +523,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'), @@ -672,7 +671,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}") @@ -728,14 +727,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'), @@ -859,7 +858,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}") @@ -868,10 +867,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: @@ -905,14 +904,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'), @@ -1010,7 +1009,7 @@ def refresh_management_station_config(self, management_station_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"refresh_management_station_config got unknown kwargs: {extra_kwargs!r}") @@ -1019,10 +1018,10 @@ def refresh_management_station_config(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 = { @@ -1032,7 +1031,7 @@ def refresh_management_station_config(self, management_station_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'), @@ -1130,7 +1129,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}") @@ -1139,10 +1138,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 = { @@ -1152,7 +1151,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'), @@ -1252,7 +1251,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}") @@ -1262,10 +1261,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 = { @@ -1275,7 +1274,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'), @@ -1365,7 +1364,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}") @@ -1374,10 +1373,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 = { @@ -1386,7 +1385,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 a4ed58ce34..3831d2c862 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 @@ -184,7 +183,7 @@ def attach_lifecycle_stage_to_profile(self, profile_id, attach_lifecycle_stage_t "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_lifecycle_stage_to_profile got unknown kwargs: {extra_kwargs!r}") @@ -193,10 +192,10 @@ def attach_lifecycle_stage_to_profile(self, profile_id, attach_lifecycle_stage_t "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 = { @@ -206,7 +205,7 @@ def attach_lifecycle_stage_to_profile(self, profile_id, attach_lifecycle_stage_t "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'), @@ -308,7 +307,7 @@ def attach_managed_instance_group_to_profile(self, profile_id, attach_managed_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"attach_managed_instance_group_to_profile got unknown kwargs: {extra_kwargs!r}") @@ -317,10 +316,10 @@ def attach_managed_instance_group_to_profile(self, profile_id, attach_managed_in "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 = { @@ -330,7 +329,7 @@ def attach_managed_instance_group_to_profile(self, profile_id, attach_managed_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'), @@ -432,7 +431,7 @@ def attach_management_station_to_profile(self, profile_id, attach_management_sta "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_management_station_to_profile got unknown kwargs: {extra_kwargs!r}") @@ -441,10 +440,10 @@ def attach_management_station_to_profile(self, profile_id, attach_management_sta "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 = { @@ -454,7 +453,7 @@ def attach_management_station_to_profile(self, profile_id, attach_management_sta "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'), @@ -556,7 +555,7 @@ def attach_software_sources_to_profile(self, profile_id, attach_software_sources "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_profile got unknown kwargs: {extra_kwargs!r}") @@ -565,10 +564,10 @@ def attach_software_sources_to_profile(self, profile_id, attach_software_sources "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 = { @@ -578,7 +577,7 @@ def attach_software_sources_to_profile(self, profile_id, attach_software_sources "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'), @@ -680,7 +679,7 @@ def change_profile_compartment(self, profile_id, change_profile_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_profile_compartment got unknown kwargs: {extra_kwargs!r}") @@ -689,10 +688,10 @@ def change_profile_compartment(self, profile_id, change_profile_compartment_deta "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 = { @@ -702,7 +701,7 @@ def change_profile_compartment(self, profile_id, change_profile_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'), @@ -789,7 +788,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}") @@ -800,7 +799,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'), @@ -889,7 +888,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}") @@ -898,10 +897,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 = { @@ -910,7 +909,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'), @@ -1009,7 +1008,7 @@ def detach_software_sources_from_profile(self, profile_id, detach_software_sourc "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_profile got unknown kwargs: {extra_kwargs!r}") @@ -1018,10 +1017,10 @@ def detach_software_sources_from_profile(self, profile_id, detach_software_sourc "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 = { @@ -1031,7 +1030,7 @@ def detach_software_sources_from_profile(self, profile_id, detach_software_sourc "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'), @@ -1112,7 +1111,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}") @@ -1121,10 +1120,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 = { @@ -1132,7 +1131,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'), @@ -1215,7 +1214,7 @@ def get_profile_version(self, profile_id, profile_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_profile_version got unknown kwargs: {extra_kwargs!r}") @@ -1225,10 +1224,10 @@ def get_profile_version(self, profile_id, profile_version, **kwargs): "profileVersion": profile_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 = { @@ -1236,7 +1235,7 @@ def get_profile_version(self, profile_id, profile_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'), @@ -1360,7 +1359,7 @@ def list_profile_available_software_sources(self, 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_profile_available_software_sources got unknown kwargs: {extra_kwargs!r}") @@ -1369,10 +1368,10 @@ def list_profile_available_software_sources(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') if 'sort_order' in kwargs: @@ -1398,14 +1397,14 @@ def list_profile_available_software_sources(self, 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'), @@ -1593,7 +1592,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}") @@ -1669,14 +1668,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'), @@ -1767,7 +1766,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}") @@ -1776,10 +1775,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 = { @@ -1788,7 +1787,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 be0ca2b423..94bfea3551 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 @@ -247,7 +246,7 @@ def get_managed_instance_analytic_content(self, **kwargs): "report_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_analytic_content got unknown kwargs: {extra_kwargs!r}") @@ -317,14 +316,14 @@ def get_managed_instance_analytic_content(self, **kwargs): "reportFormat": kwargs.get("report_format", missing), "reportType": kwargs.get("report_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/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'), @@ -439,7 +438,7 @@ def get_managed_instance_content(self, managed_instance_id, vulnerability_type, "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_managed_instance_content got unknown kwargs: {extra_kwargs!r}") @@ -448,10 +447,10 @@ def get_managed_instance_content(self, managed_instance_id, vulnerability_type, "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: @@ -485,14 +484,14 @@ def get_managed_instance_content(self, managed_instance_id, vulnerability_type, "vulnerabilityType": self.base_client.generate_collection_format_param(vulnerability_type, 'multi'), "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/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'), @@ -666,7 +665,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}") @@ -742,14 +741,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 f14607003f..da6ab59265 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 @@ -184,7 +183,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}") @@ -193,10 +192,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 = { @@ -206,7 +205,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'), @@ -293,7 +292,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}") @@ -304,7 +303,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'), @@ -393,7 +392,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}") @@ -402,10 +401,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 = { @@ -414,7 +413,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'), @@ -492,7 +491,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}") @@ -501,10 +500,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 = { @@ -512,7 +511,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'), @@ -715,7 +714,7 @@ def list_scheduled_jobs(self, **kwargs): "location_not_equal_to", "is_managed_by_autonomous_linux" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -795,14 +794,14 @@ def list_scheduled_jobs(self, **kwargs): "locationNotEqualTo": self.base_client.generate_collection_format_param(kwargs.get("location_not_equal_to", missing), 'multi'), "isManagedByAutonomousLinux": kwargs.get("is_managed_by_autonomous_linux", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -908,10 +907,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 = { @@ -921,7 +920,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'), @@ -1011,7 +1010,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}") @@ -1020,10 +1019,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 = { @@ -1032,7 +1031,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 9f09f4af66..4ce8e8670d 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 @@ -188,7 +187,7 @@ def add_packages_to_software_source(self, software_source_id, add_packages_to_so "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_packages_to_software_source got unknown kwargs: {extra_kwargs!r}") @@ -197,10 +196,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 = { @@ -210,7 +209,7 @@ def add_packages_to_software_source(self, software_source_id, add_packages_to_so "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_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}") @@ -308,7 +307,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'), @@ -411,7 +410,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}") @@ -420,10 +419,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 = { @@ -433,7 +432,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'), @@ -520,7 +519,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}") @@ -531,7 +530,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'), @@ -616,7 +615,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}") @@ -627,7 +626,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'), @@ -716,7 +715,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}") @@ -725,10 +724,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 = { @@ -737,7 +736,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'), @@ -818,7 +817,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}") @@ -827,23 +826,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'), @@ -931,7 +930,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}") @@ -941,23 +940,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'), @@ -1048,7 +1047,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}") @@ -1058,24 +1057,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'), @@ -1160,7 +1159,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}") @@ -1170,10 +1169,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 = { @@ -1181,7 +1180,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'), @@ -1264,7 +1263,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}") @@ -1274,10 +1273,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 = { @@ -1285,7 +1284,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'), @@ -1363,7 +1362,7 @@ def get_software_package_by_name(self, software_package_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_software_package_by_name got unknown kwargs: {extra_kwargs!r}") @@ -1372,10 +1371,10 @@ def get_software_package_by_name(self, software_package_name, **kwargs): "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 = { @@ -1383,7 +1382,7 @@ def get_software_package_by_name(self, software_package_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'), @@ -1463,7 +1462,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}") @@ -1472,10 +1471,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 = { @@ -1483,7 +1482,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'), @@ -1563,7 +1562,7 @@ def get_software_source_manifest(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_manifest got unknown kwargs: {extra_kwargs!r}") @@ -1572,10 +1571,10 @@ def get_software_source_manifest(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 = { @@ -1583,7 +1582,7 @@ def get_software_source_manifest(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'), @@ -1717,7 +1716,7 @@ def list_all_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"list_all_software_packages got unknown kwargs: {extra_kwargs!r}") @@ -1762,14 +1761,14 @@ def list_all_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'), @@ -1892,7 +1891,7 @@ def list_available_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_available_software_packages got unknown kwargs: {extra_kwargs!r}") @@ -1901,10 +1900,10 @@ def list_available_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: @@ -1930,14 +1929,14 @@ def list_available_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'), @@ -2062,7 +2061,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}") @@ -2097,14 +2096,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'), @@ -2261,7 +2260,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}") @@ -2326,14 +2325,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'), @@ -2459,7 +2458,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}") @@ -2468,10 +2467,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: @@ -2497,14 +2496,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'), @@ -2636,7 +2635,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}") @@ -2645,10 +2644,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: @@ -2675,14 +2674,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'), @@ -2813,7 +2812,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}") @@ -2822,10 +2821,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: @@ -2852,14 +2851,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'), @@ -3023,7 +3022,7 @@ def list_software_package_software_sources(self, software_package_name, compartm "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_package_software_sources got unknown kwargs: {extra_kwargs!r}") @@ -3032,10 +3031,10 @@ def list_software_package_software_sources(self, software_package_name, compartm "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') if 'software_source_type' in kwargs: @@ -3116,14 +3115,14 @@ def list_software_package_software_sources(self, software_package_name, compartm "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'), @@ -3248,7 +3247,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}") @@ -3257,10 +3256,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: @@ -3286,14 +3285,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'), @@ -3392,7 +3391,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}") @@ -3417,14 +3416,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'), @@ -3608,7 +3607,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}") @@ -3703,14 +3702,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'), @@ -3813,7 +3812,7 @@ def remove_packages_from_software_source(self, software_source_id, remove_packag "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_packages_from_software_source got unknown kwargs: {extra_kwargs!r}") @@ -3822,10 +3821,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 = { @@ -3835,7 +3834,7 @@ def remove_packages_from_software_source(self, software_source_id, remove_packag "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'), @@ -3939,7 +3938,7 @@ def replace_packages_in_software_source(self, software_source_id, replace_packag "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"replace_packages_in_software_source got unknown kwargs: {extra_kwargs!r}") @@ -3948,10 +3947,10 @@ def replace_packages_in_software_source(self, software_source_id, replace_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 = { @@ -3961,7 +3960,7 @@ def replace_packages_in_software_source(self, software_source_id, replace_packag "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'), @@ -4059,7 +4058,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}") @@ -4068,14 +4067,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'), @@ -4174,7 +4173,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}") @@ -4183,14 +4182,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'), @@ -4289,7 +4288,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}") @@ -4298,14 +4297,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'), @@ -4403,7 +4402,7 @@ def software_source_generate_metadata(self, software_source_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"software_source_generate_metadata got unknown kwargs: {extra_kwargs!r}") @@ -4412,10 +4411,10 @@ def software_source_generate_metadata(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 = { @@ -4425,7 +4424,7 @@ def software_source_generate_metadata(self, software_source_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'), @@ -4515,7 +4514,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}") @@ -4524,10 +4523,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 = { @@ -4536,7 +4535,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'), @@ -4645,7 +4644,7 @@ def update_software_source_manifest(self, update_software_source_manifest_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"update_software_source_manifest got unknown kwargs: {extra_kwargs!r}") @@ -4654,10 +4653,10 @@ def update_software_source_manifest(self, update_software_source_manifest_detail "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 = { @@ -4666,7 +4665,7 @@ def update_software_source_manifest(self, update_software_source_manifest_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} # If the body parameter is optional we need to assign it to a variable so additional type checking can be performed. try: @@ -4675,7 +4674,7 @@ def update_software_source_manifest(self, update_software_source_manifest_detail update_software_source_manifest_details = kwargs.get("update_software_source_manifest_details", missing) if update_software_source_manifest_details is not missing and update_software_source_manifest_details is not None: - if (not isinstance(update_software_source_manifest_details, (six.binary_type, six.string_types)) and + if (not isinstance(update_software_source_manifest_details, (bytes, str)) and not hasattr(update_software_source_manifest_details, "read")): raise TypeError('The body must be a string, bytes, or provide a read() method.') diff --git a/src/oci/os_management_hub/work_request_client.py b/src/oci/os_management_hub/work_request_client.py index 9f2ec8b98d..97d37e6195 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 @@ -163,7 +162,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}") @@ -172,10 +171,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 = { @@ -183,7 +182,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'), @@ -294,7 +293,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}") @@ -303,10 +302,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: @@ -329,14 +328,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'), @@ -449,7 +448,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}") @@ -458,10 +457,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: @@ -484,14 +483,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'), @@ -678,7 +677,7 @@ def list_work_requests(self, **kwargs): "time_created_greater_than_or_equal_to", "is_managed_by_autonomous_linux" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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}") @@ -733,14 +732,14 @@ def list_work_requests(self, **kwargs): "timeCreatedGreaterThanOrEqualTo": kwargs.get("time_created_greater_than_or_equal_to", missing), "isManagedByAutonomousLinux": kwargs.get("is_managed_by_autonomous_linux", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -843,7 +842,7 @@ def rerun_work_request(self, work_request_id, rerun_work_request_details, **kwar "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"rerun_work_request got unknown kwargs: {extra_kwargs!r}") @@ -852,10 +851,10 @@ def rerun_work_request(self, work_request_id, rerun_work_request_details, **kwar "workRequestId": work_request_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 rerun_work_request(self, work_request_id, rerun_work_request_details, **kwar "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/osp_gateway/address_rule_service_client.py b/src/oci/osp_gateway/address_rule_service_client.py index 355b8f0075..68b010dbe1 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 @@ -169,7 +168,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}") @@ -178,24 +177,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 87352c1801..f78e660bcf 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 @@ -169,7 +168,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}") @@ -178,24 +177,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'), @@ -297,7 +296,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}") @@ -306,7 +305,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", @@ -315,7 +314,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 dd95f2b81d..ad9e5c5555 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 @@ -169,7 +168,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}") @@ -178,24 +177,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'), @@ -284,7 +283,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}") @@ -293,24 +292,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'), @@ -407,7 +406,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}") @@ -416,10 +415,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 = { @@ -428,14 +427,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'), @@ -580,7 +579,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}") @@ -631,14 +630,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'), @@ -741,7 +740,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}") @@ -750,17 +749,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", @@ -769,7 +768,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 06c9fb8a38..44d33f1406 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 @@ -185,7 +184,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}") @@ -194,17 +193,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", @@ -213,7 +212,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'), @@ -305,7 +304,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}") @@ -314,24 +313,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'), @@ -437,7 +436,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}") @@ -464,14 +463,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'), @@ -574,7 +573,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}") @@ -583,17 +582,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", @@ -602,7 +601,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'), @@ -705,7 +704,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}") @@ -714,17 +713,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", @@ -732,7 +731,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 5993d9b1d6..ebd4fd9b26 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 @@ -194,7 +193,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}") @@ -222,7 +221,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", @@ -230,7 +229,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 d5d1528fb1..a1a00d026c 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 @@ -189,7 +188,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}") @@ -216,7 +215,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", @@ -224,7 +223,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 86fff1175b..6c404ab8a2 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 @@ -169,7 +168,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}") @@ -178,10 +177,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 = { @@ -191,7 +190,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'), @@ -301,7 +300,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}") @@ -328,7 +327,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", @@ -337,7 +336,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 b3268dcf6c..f84cdacb56 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 @@ -202,7 +201,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}") @@ -232,7 +231,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", @@ -240,7 +239,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 8ed9073cc6..35a9c5d12a 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 @@ -210,7 +209,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}") @@ -240,7 +239,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", @@ -249,7 +248,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 67de2f49c8..a7688a3bdb 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 @@ -174,7 +173,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}") @@ -183,17 +182,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", @@ -201,7 +200,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'), @@ -312,7 +311,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}") @@ -334,7 +333,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", @@ -342,7 +341,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'), @@ -461,7 +460,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}") @@ -492,7 +491,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", @@ -500,7 +499,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/psa/private_service_access_client.py b/src/oci/psa/private_service_access_client.py index dcabc24a87..c06de0a90c 100644 --- a/src/oci/psa/private_service_access_client.py +++ b/src/oci/psa/private_service_access_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_psa_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_psa_work_request got unknown kwargs: {extra_kwargs!r}") @@ -182,10 +181,10 @@ def cancel_psa_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_psa_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'), @@ -296,7 +295,7 @@ def change_private_service_access_compartment(self, private_service_access_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_service_access_compartment got unknown kwargs: {extra_kwargs!r}") @@ -305,10 +304,10 @@ def change_private_service_access_compartment(self, private_service_access_id, c "privateServiceAccessId": private_service_access_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_private_service_access_compartment(self, private_service_access_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'), @@ -409,7 +408,7 @@ def create_private_service_access(self, create_private_service_access_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_private_service_access got unknown kwargs: {extra_kwargs!r}") @@ -420,7 +419,7 @@ def create_private_service_access(self, create_private_service_access_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'), @@ -511,7 +510,7 @@ def delete_private_service_access(self, private_service_access_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_service_access got unknown kwargs: {extra_kwargs!r}") @@ -520,10 +519,10 @@ def delete_private_service_access(self, private_service_access_id, **kwargs): "privateServiceAccessId": private_service_access_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 delete_private_service_access(self, private_service_access_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 get_private_service_access(self, private_service_access_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_service_access got unknown kwargs: {extra_kwargs!r}") @@ -622,10 +621,10 @@ def get_private_service_access(self, private_service_access_id, **kwargs): "privateServiceAccessId": private_service_access_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -633,7 +632,7 @@ def get_private_service_access(self, private_service_access_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -716,7 +715,7 @@ def get_psa_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_psa_work_request got unknown kwargs: {extra_kwargs!r}") @@ -725,10 +724,10 @@ def get_psa_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 = { @@ -736,7 +735,7 @@ def get_psa_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'), @@ -879,7 +878,7 @@ def list_private_service_accesses(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_private_service_accesses got unknown kwargs: {extra_kwargs!r}") @@ -917,14 +916,14 @@ def list_private_service_accesses(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'), @@ -1038,7 +1037,7 @@ def list_psa_services(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_psa_services got unknown kwargs: {extra_kwargs!r}") @@ -1065,14 +1064,14 @@ def list_psa_services(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'), @@ -1183,7 +1182,7 @@ def list_psa_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_psa_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -1192,10 +1191,10 @@ def list_psa_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: @@ -1218,14 +1217,14 @@ def list_psa_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'), @@ -1338,7 +1337,7 @@ def list_psa_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_psa_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -1347,10 +1346,10 @@ def list_psa_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: @@ -1373,14 +1372,14 @@ def list_psa_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'), @@ -1512,7 +1511,7 @@ def list_psa_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_psa_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1548,14 +1547,14 @@ def list_psa_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'), @@ -1648,7 +1647,7 @@ def update_private_service_access(self, private_service_access_id, update_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_private_service_access got unknown kwargs: {extra_kwargs!r}") @@ -1657,10 +1656,10 @@ def update_private_service_access(self, private_service_access_id, update_privat "privateServiceAccessId": private_service_access_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -1669,7 +1668,7 @@ def update_private_service_access(self, private_service_access_id, update_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'), diff --git a/src/oci/psql/postgresql_client.py b/src/oci/psql/postgresql_client.py index 76405089e7..abcc09c5dc 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 @@ -176,7 +175,7 @@ def backup_copy(self, backup_id, backup_copy_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"backup_copy got unknown kwargs: {extra_kwargs!r}") @@ -185,10 +184,10 @@ def backup_copy(self, backup_id, backup_copy_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 = { @@ -198,7 +197,7 @@ def backup_copy(self, backup_id, backup_copy_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'), @@ -292,7 +291,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}") @@ -301,10 +300,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 = { @@ -314,7 +313,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'), @@ -408,7 +407,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}") @@ -417,10 +416,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 = { @@ -430,7 +429,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'), @@ -524,7 +523,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}") @@ -533,10 +532,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 = { @@ -546,7 +545,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'), @@ -632,7 +631,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}") @@ -643,7 +642,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'), @@ -727,7 +726,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}") @@ -738,7 +737,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'), @@ -824,7 +823,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}") @@ -835,7 +834,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'), @@ -919,7 +918,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}") @@ -928,10 +927,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 = { @@ -940,7 +939,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'), @@ -1021,7 +1020,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}") @@ -1030,10 +1029,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 = { @@ -1042,7 +1041,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'), @@ -1123,7 +1122,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}") @@ -1132,10 +1131,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 = { @@ -1144,7 +1143,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'), @@ -1235,7 +1234,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}") @@ -1244,10 +1243,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 = { @@ -1257,7 +1256,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'), @@ -1336,7 +1335,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}") @@ -1345,10 +1344,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 = { @@ -1356,7 +1355,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'), @@ -1434,7 +1433,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}") @@ -1443,10 +1442,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 = { @@ -1454,7 +1453,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'), @@ -1532,7 +1531,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}") @@ -1541,10 +1540,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 = { @@ -1552,7 +1551,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'), @@ -1636,7 +1635,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}") @@ -1645,10 +1644,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: @@ -1662,14 +1661,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'), @@ -1749,7 +1748,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}") @@ -1758,10 +1757,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 = { @@ -1769,7 +1768,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'), @@ -1847,7 +1846,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}") @@ -1856,10 +1855,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 = { @@ -1867,7 +1866,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'), @@ -1945,7 +1944,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}") @@ -1954,10 +1953,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 = { @@ -1965,7 +1964,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'), @@ -2094,7 +2093,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}") @@ -2133,14 +2132,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'), @@ -2275,7 +2274,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}") @@ -2323,14 +2322,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'), @@ -2443,7 +2442,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}") @@ -2479,14 +2478,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'), @@ -2611,7 +2610,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}") @@ -2650,14 +2649,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'), @@ -2760,7 +2759,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}") @@ -2787,14 +2786,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'), @@ -2892,7 +2891,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}") @@ -2901,10 +2900,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: @@ -2927,14 +2926,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'), @@ -3034,7 +3033,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}") @@ -3043,10 +3042,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: @@ -3069,14 +3068,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'), @@ -3191,7 +3190,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}") @@ -3227,14 +3226,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'), @@ -3320,7 +3319,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}") @@ -3329,10 +3328,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 = { @@ -3341,7 +3340,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'), @@ -3434,7 +3433,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}") @@ -3443,10 +3442,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 = { @@ -3456,7 +3455,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'), @@ -3550,7 +3549,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}") @@ -3559,10 +3558,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 = { @@ -3572,7 +3571,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'), @@ -3666,7 +3665,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}") @@ -3675,10 +3674,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 = { @@ -3688,7 +3687,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'), @@ -3775,7 +3774,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}") @@ -3784,10 +3783,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 = { @@ -3796,7 +3795,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'), @@ -3891,7 +3890,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}") @@ -3900,10 +3899,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 = { @@ -3913,7 +3912,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'), @@ -4009,7 +4008,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}") @@ -4018,10 +4017,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 = { @@ -4031,7 +4030,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'), @@ -4128,7 +4127,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}") @@ -4138,10 +4137,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 = { @@ -4151,7 +4150,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 f15bcc1a51..1f823ae83c 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 @@ -171,7 +170,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}") @@ -180,10 +179,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 = { @@ -192,7 +191,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'), @@ -278,7 +277,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}") @@ -289,7 +288,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'), @@ -374,7 +373,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}") @@ -383,10 +382,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 = { @@ -395,7 +394,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'), @@ -471,7 +470,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}") @@ -480,10 +479,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 = { @@ -491,7 +490,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'), @@ -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'), @@ -708,7 +707,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}") @@ -744,14 +743,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'), @@ -841,7 +840,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}") @@ -850,24 +849,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'), @@ -959,7 +958,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}") @@ -968,24 +967,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'), @@ -1084,7 +1083,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}") @@ -1095,14 +1094,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'), @@ -1193,7 +1192,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}") @@ -1202,10 +1201,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 = { @@ -1214,7 +1213,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'), @@ -1303,7 +1302,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}") @@ -1312,10 +1311,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 = { @@ -1324,7 +1323,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 02bbb09417..56630248cd 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 @@ -167,7 +166,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}") @@ -177,10 +176,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 = { @@ -188,7 +187,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'), @@ -271,7 +270,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}") @@ -280,10 +279,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 = { @@ -291,7 +290,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'), @@ -401,7 +400,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}") @@ -410,10 +409,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 = { @@ -422,14 +421,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'), @@ -515,7 +514,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}") @@ -524,23 +523,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'), @@ -639,7 +638,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}") @@ -648,10 +647,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 = { @@ -659,14 +658,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'), @@ -753,7 +752,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}") @@ -762,10 +761,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 = { @@ -773,7 +772,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'), @@ -861,7 +860,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}") @@ -871,10 +870,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 = { @@ -882,7 +881,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'), @@ -969,7 +968,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}") @@ -978,10 +977,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 = { @@ -989,7 +988,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 855cc21b66..505f30e321 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 @@ -168,7 +167,7 @@ def cancel_protected_database_deletion(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"cancel_protected_database_deletion got unknown kwargs: {extra_kwargs!r}") @@ -177,10 +176,10 @@ def cancel_protected_database_deletion(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 = { @@ -189,7 +188,7 @@ def cancel_protected_database_deletion(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'), @@ -276,7 +275,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}") @@ -285,10 +284,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 = { @@ -297,7 +296,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'), @@ -386,7 +385,7 @@ def change_protected_database_subscription(self, protected_database_id, change_p "opc_request_id", "if_match" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_subscription got unknown kwargs: {extra_kwargs!r}") @@ -395,10 +394,10 @@ def change_protected_database_subscription(self, protected_database_id, change_p "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 = { @@ -407,7 +406,7 @@ def change_protected_database_subscription(self, protected_database_id, change_p "opc-request-id": kwargs.get("opc_request_id", missing), "if-match": kwargs.get("if_match", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -505,10 +504,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 = { @@ -517,7 +516,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'), @@ -606,7 +605,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}") @@ -615,10 +614,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 = { @@ -627,7 +626,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'), @@ -737,7 +736,7 @@ def create_protected_database(self, create_protected_database_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_protected_database got unknown kwargs: {extra_kwargs!r}") @@ -749,7 +748,7 @@ def create_protected_database(self, create_protected_database_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'), @@ -836,7 +835,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}") @@ -847,7 +846,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'), @@ -934,7 +933,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}") @@ -945,7 +944,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'), @@ -1040,7 +1039,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}") @@ -1049,10 +1048,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') if 'deletion_schedule' in kwargs: @@ -1065,7 +1064,7 @@ def delete_protected_database(self, protected_database_id, **kwargs): query_params = { "deletionSchedule": kwargs.get("deletion_schedule", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", @@ -1073,7 +1072,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'), @@ -1160,7 +1159,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}") @@ -1169,10 +1168,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 = { @@ -1181,7 +1180,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'), @@ -1265,7 +1264,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}") @@ -1274,10 +1273,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 = { @@ -1286,7 +1285,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'), @@ -1374,7 +1373,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}") @@ -1383,10 +1382,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 = { @@ -1395,7 +1394,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'), @@ -1475,7 +1474,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}") @@ -1484,10 +1483,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 = { @@ -1495,7 +1494,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'), @@ -1573,7 +1572,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}") @@ -1582,10 +1581,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 = { @@ -1593,7 +1592,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'), @@ -1671,7 +1670,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}") @@ -1680,10 +1679,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 = { @@ -1691,7 +1690,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'), @@ -1769,7 +1768,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}") @@ -1778,10 +1777,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 = { @@ -1789,7 +1788,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'), @@ -1915,7 +1914,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}") @@ -1953,14 +1952,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'), @@ -2084,7 +2083,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}") @@ -2128,14 +2127,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'), @@ -2257,7 +2256,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}") @@ -2294,14 +2293,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'), @@ -2402,7 +2401,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}") @@ -2411,10 +2410,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: @@ -2437,14 +2436,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'), @@ -2547,7 +2546,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}") @@ -2556,10 +2555,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: @@ -2582,14 +2581,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'), @@ -2706,7 +2705,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}") @@ -2742,14 +2741,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'), @@ -2841,7 +2840,7 @@ def schedule_protected_database_deletion(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"schedule_protected_database_deletion got unknown kwargs: {extra_kwargs!r}") @@ -2850,10 +2849,10 @@ def schedule_protected_database_deletion(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 = { @@ -2862,7 +2861,7 @@ def schedule_protected_database_deletion(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'), @@ -2951,7 +2950,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}") @@ -2960,10 +2959,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 = { @@ -2972,7 +2971,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'), @@ -3061,7 +3060,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}") @@ -3070,10 +3069,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 = { @@ -3082,7 +3081,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'), @@ -3171,7 +3170,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}") @@ -3180,10 +3179,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 = { @@ -3192,7 +3191,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/oci_cache_config_set_client.py b/src/oci/redis/oci_cache_config_set_client.py index e4af4788ca..aa3073f815 100644 --- a/src/oci/redis/oci_cache_config_set_client.py +++ b/src/oci/redis/oci_cache_config_set_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_oci_cache_config_set_compartment(self, oci_cache_config_set_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_oci_cache_config_set_compartment got unknown kwargs: {extra_kwargs!r}") @@ -188,10 +187,10 @@ def change_oci_cache_config_set_compartment(self, oci_cache_config_set_id, chang "ociCacheConfigSetId": oci_cache_config_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 = { @@ -201,7 +200,7 @@ def change_oci_cache_config_set_compartment(self, oci_cache_config_set_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'), @@ -288,7 +287,7 @@ def create_oci_cache_config_set(self, create_oci_cache_config_set_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_oci_cache_config_set got unknown kwargs: {extra_kwargs!r}") @@ -299,7 +298,7 @@ def create_oci_cache_config_set(self, create_oci_cache_config_set_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'), @@ -386,7 +385,7 @@ def delete_oci_cache_config_set(self, oci_cache_config_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_oci_cache_config_set got unknown kwargs: {extra_kwargs!r}") @@ -395,10 +394,10 @@ def delete_oci_cache_config_set(self, oci_cache_config_set_id, **kwargs): "ociCacheConfigSetId": oci_cache_config_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 = { @@ -407,7 +406,7 @@ def delete_oci_cache_config_set(self, oci_cache_config_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'), @@ -483,7 +482,7 @@ def get_oci_cache_config_set(self, oci_cache_config_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_oci_cache_config_set got unknown kwargs: {extra_kwargs!r}") @@ -492,10 +491,10 @@ def get_oci_cache_config_set(self, oci_cache_config_set_id, **kwargs): "ociCacheConfigSetId": oci_cache_config_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 = { @@ -503,7 +502,7 @@ def get_oci_cache_config_set(self, oci_cache_config_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'), @@ -601,7 +600,7 @@ def list_associated_oci_cache_clusters(self, oci_cache_config_set_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_oci_cache_clusters got unknown kwargs: {extra_kwargs!r}") @@ -610,10 +609,10 @@ def list_associated_oci_cache_clusters(self, oci_cache_config_set_id, **kwargs): "ociCacheConfigSetId": oci_cache_config_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') if 'sort_order' in kwargs: @@ -636,14 +635,14 @@ def list_associated_oci_cache_clusters(self, oci_cache_config_set_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -764,7 +763,7 @@ def list_oci_cache_config_sets(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_oci_cache_config_sets got unknown kwargs: {extra_kwargs!r}") @@ -808,14 +807,14 @@ def list_oci_cache_config_sets(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'), @@ -904,7 +903,7 @@ def update_oci_cache_config_set(self, oci_cache_config_set_id, update_oci_cache_ "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_oci_cache_config_set got unknown kwargs: {extra_kwargs!r}") @@ -913,10 +912,10 @@ def update_oci_cache_config_set(self, oci_cache_config_set_id, update_oci_cache_ "ociCacheConfigSetId": oci_cache_config_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 = { @@ -925,7 +924,7 @@ def update_oci_cache_config_set(self, oci_cache_config_set_id, update_oci_cache_ "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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/oci_cache_default_config_set_client.py b/src/oci/redis/oci_cache_default_config_set_client.py index c384615083..63fa808ebc 100644 --- a/src/oci/redis/oci_cache_default_config_set_client.py +++ b/src/oci/redis/oci_cache_default_config_set_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 get_oci_cache_default_config_set(self, compartment_id, oci_cache_default_con "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_oci_cache_default_config_set got unknown kwargs: {extra_kwargs!r}") @@ -172,23 +171,23 @@ def get_oci_cache_default_config_set(self, compartment_id, oci_cache_default_con "ociCacheDefaultConfigSetId": oci_cache_default_config_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 = { "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'), @@ -308,7 +307,7 @@ def list_oci_cache_default_config_sets(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_oci_cache_default_config_sets got unknown kwargs: {extra_kwargs!r}") @@ -352,14 +351,14 @@ def list_oci_cache_default_config_sets(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/redis/oci_cache_user_client.py b/src/oci/redis/oci_cache_user_client.py index 04ddc45cd3..cc548ebfc3 100644 --- a/src/oci/redis/oci_cache_user_client.py +++ b/src/oci/redis/oci_cache_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 @@ -179,7 +178,7 @@ def change_oci_cache_user_compartment(self, oci_cache_user_id, change_oci_cache_ "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"change_oci_cache_user_compartment got unknown kwargs: {extra_kwargs!r}") @@ -188,10 +187,10 @@ def change_oci_cache_user_compartment(self, oci_cache_user_id, change_oci_cache_ "ociCacheUserId": oci_cache_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 = { @@ -201,7 +200,7 @@ def change_oci_cache_user_compartment(self, oci_cache_user_id, change_oci_cache_ "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 create_oci_cache_user(self, create_oci_cache_user_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_oci_cache_user got unknown kwargs: {extra_kwargs!r}") @@ -299,7 +298,7 @@ def create_oci_cache_user(self, create_oci_cache_user_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_oci_cache_user(self, oci_cache_user_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_oci_cache_user got unknown kwargs: {extra_kwargs!r}") @@ -395,10 +394,10 @@ def delete_oci_cache_user(self, oci_cache_user_id, **kwargs): "ociCacheUserId": oci_cache_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 = { @@ -407,7 +406,7 @@ def delete_oci_cache_user(self, oci_cache_user_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_oci_cache_user(self, oci_cache_user_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_oci_cache_user got unknown kwargs: {extra_kwargs!r}") @@ -492,10 +491,10 @@ def get_oci_cache_user(self, oci_cache_user_id, **kwargs): "ociCacheUserId": oci_cache_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 = { @@ -503,7 +502,7 @@ def get_oci_cache_user(self, oci_cache_user_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 list_attached_redis_clusters(self, oci_cache_user_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_attached_redis_clusters got unknown kwargs: {extra_kwargs!r}") @@ -618,10 +617,10 @@ def list_attached_redis_clusters(self, oci_cache_user_id, **kwargs): "ociCacheUserId": oci_cache_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_order' in kwargs: @@ -646,14 +645,14 @@ def list_attached_redis_clusters(self, oci_cache_user_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -764,7 +763,7 @@ def list_oci_cache_users(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_oci_cache_users got unknown kwargs: {extra_kwargs!r}") @@ -799,14 +798,14 @@ def list_oci_cache_users(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'), @@ -895,7 +894,7 @@ def update_oci_cache_user(self, oci_cache_user_id, update_oci_cache_user_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_oci_cache_user got unknown kwargs: {extra_kwargs!r}") @@ -904,10 +903,10 @@ def update_oci_cache_user(self, oci_cache_user_id, update_oci_cache_user_details "ociCacheUserId": oci_cache_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 = { @@ -916,7 +915,7 @@ def update_oci_cache_user(self, oci_cache_user_id, update_oci_cache_user_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/redis/redis_cluster_client.py b/src/oci/redis/redis_cluster_client.py index ce8222e541..2bce6c358c 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 @@ -181,7 +180,7 @@ def attach_oci_cache_users(self, redis_cluster_id, attach_oci_cache_users_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"attach_oci_cache_users got unknown kwargs: {extra_kwargs!r}") @@ -190,10 +189,10 @@ def attach_oci_cache_users(self, redis_cluster_id, attach_oci_cache_users_detail "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 = { @@ -203,7 +202,7 @@ def attach_oci_cache_users(self, redis_cluster_id, attach_oci_cache_users_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'), @@ -290,7 +289,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}") @@ -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): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_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}") @@ -419,10 +418,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 = { @@ -432,7 +431,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'), @@ -521,7 +520,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}") @@ -532,7 +531,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'), @@ -623,7 +622,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}") @@ -632,10 +631,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 = { @@ -644,7 +643,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'), @@ -741,7 +740,7 @@ def detach_oci_cache_users(self, redis_cluster_id, detach_oci_cache_users_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"detach_oci_cache_users got unknown kwargs: {extra_kwargs!r}") @@ -750,10 +749,10 @@ def detach_oci_cache_users(self, redis_cluster_id, detach_oci_cache_users_detail "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 = { @@ -763,7 +762,7 @@ def detach_oci_cache_users(self, redis_cluster_id, detach_oci_cache_users_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'), @@ -846,7 +845,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}") @@ -855,10 +854,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 = { @@ -866,7 +865,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'), @@ -944,7 +943,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}") @@ -953,10 +952,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 = { @@ -964,7 +963,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'), @@ -1072,7 +1071,7 @@ def list_attached_oci_cache_users(self, redis_cluster_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_attached_oci_cache_users got unknown kwargs: {extra_kwargs!r}") @@ -1081,10 +1080,10 @@ def list_attached_oci_cache_users(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') if 'sort_order' in kwargs: @@ -1109,14 +1108,14 @@ def list_attached_oci_cache_users(self, redis_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'), @@ -1222,7 +1221,7 @@ def list_redis_cluster_nodes(self, redis_cluster_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_redis_cluster_nodes got unknown kwargs: {extra_kwargs!r}") @@ -1231,10 +1230,10 @@ def list_redis_cluster_nodes(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') if 'sort_order' in kwargs: @@ -1258,14 +1257,14 @@ def list_redis_cluster_nodes(self, redis_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'), @@ -1384,7 +1383,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}") @@ -1420,14 +1419,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'), @@ -1525,7 +1524,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}") @@ -1534,10 +1533,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: @@ -1560,14 +1559,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'), @@ -1667,7 +1666,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}") @@ -1676,10 +1675,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: @@ -1702,14 +1701,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'), @@ -1826,7 +1825,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}") @@ -1862,14 +1861,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'), @@ -1962,7 +1961,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}") @@ -1971,10 +1970,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 = { @@ -1983,7 +1982,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/redis/redis_identity_client.py b/src/oci/redis/redis_identity_client.py index 3fb66a9bde..e5794326cb 100644 --- a/src/oci/redis/redis_identity_client.py +++ b/src/oci/redis/redis_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 @@ -181,7 +180,7 @@ def create_identity_token(self, create_identity_token_details, redis_cluster_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"create_identity_token got unknown kwargs: {extra_kwargs!r}") @@ -190,10 +189,10 @@ def create_identity_token(self, create_identity_token_details, redis_cluster_id, "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 = { @@ -203,7 +202,7 @@ def create_identity_token(self, create_identity_token_details, redis_cluster_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'), diff --git a/src/oci/regions.py b/src/oci/regions.py index 0cd23ecad4..adff1929c9 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_analytics/monitored_region_client.py b/src/oci/resource_analytics/monitored_region_client.py index 26320e98ac..8a359d6f8f 100644 --- a/src/oci/resource_analytics/monitored_region_client.py +++ b/src/oci/resource_analytics/monitored_region_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 create_monitored_region(self, create_monitored_region_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_monitored_region got unknown kwargs: {extra_kwargs!r}") @@ -182,7 +181,7 @@ def create_monitored_region(self, create_monitored_region_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'), @@ -273,7 +272,7 @@ def delete_monitored_region(self, monitored_region_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_region got unknown kwargs: {extra_kwargs!r}") @@ -282,10 +281,10 @@ def delete_monitored_region(self, monitored_region_id, **kwargs): "monitoredRegionId": monitored_region_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 delete_monitored_region(self, monitored_region_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_monitored_region(self, monitored_region_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_region got unknown kwargs: {extra_kwargs!r}") @@ -384,10 +383,10 @@ def get_monitored_region(self, monitored_region_id, **kwargs): "monitoredRegionId": monitored_region_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 get_monitored_region(self, monitored_region_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -521,7 +520,7 @@ def list_monitored_regions(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_monitored_regions got unknown kwargs: {extra_kwargs!r}") @@ -556,14 +555,14 @@ def list_monitored_regions(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/resource_analytics/resource_analytics_instance_client.py b/src/oci/resource_analytics/resource_analytics_instance_client.py index 40f7a6f2ab..0578beea87 100644 --- a/src/oci/resource_analytics/resource_analytics_instance_client.py +++ b/src/oci/resource_analytics/resource_analytics_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 @@ -172,7 +171,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}") @@ -181,10 +180,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 = { @@ -193,7 +192,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'), @@ -287,7 +286,7 @@ def change_resource_analytics_instance_compartment(self, resource_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"change_resource_analytics_instance_compartment got unknown kwargs: {extra_kwargs!r}") @@ -296,10 +295,10 @@ def change_resource_analytics_instance_compartment(self, resource_analytics_inst "resourceAnalyticsInstanceId": resource_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 = { @@ -308,7 +307,7 @@ def change_resource_analytics_instance_compartment(self, resource_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'), @@ -397,7 +396,7 @@ def create_resource_analytics_instance(self, create_resource_analytics_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_resource_analytics_instance got unknown kwargs: {extra_kwargs!r}") @@ -408,7 +407,7 @@ def create_resource_analytics_instance(self, create_resource_analytics_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'), @@ -499,7 +498,7 @@ def delete_resource_analytics_instance(self, resource_analytics_instance_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_resource_analytics_instance got unknown kwargs: {extra_kwargs!r}") @@ -508,10 +507,10 @@ def delete_resource_analytics_instance(self, resource_analytics_instance_id, **k "resourceAnalyticsInstanceId": resource_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 = { @@ -520,7 +519,7 @@ def delete_resource_analytics_instance(self, resource_analytics_instance_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'), @@ -601,7 +600,7 @@ def get_resource_analytics_instance(self, resource_analytics_instance_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_resource_analytics_instance got unknown kwargs: {extra_kwargs!r}") @@ -610,10 +609,10 @@ def get_resource_analytics_instance(self, resource_analytics_instance_id, **kwar "resourceAnalyticsInstanceId": resource_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 = { @@ -621,7 +620,7 @@ def get_resource_analytics_instance(self, resource_analytics_instance_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'), @@ -704,7 +703,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}") @@ -713,10 +712,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 = { @@ -724,7 +723,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'), @@ -854,7 +853,7 @@ def list_resource_analytics_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_resource_analytics_instances got unknown kwargs: {extra_kwargs!r}") @@ -890,14 +889,14 @@ def list_resource_analytics_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'), @@ -1008,7 +1007,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}") @@ -1017,10 +1016,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: @@ -1043,14 +1042,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'), @@ -1163,7 +1162,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}") @@ -1172,10 +1171,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: @@ -1198,14 +1197,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'), @@ -1337,7 +1336,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}") @@ -1373,14 +1372,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'), @@ -1470,7 +1469,7 @@ def resource_analytics_instance_disable_oac(self, resource_analytics_instance_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"resource_analytics_instance_disable_oac got unknown kwargs: {extra_kwargs!r}") @@ -1479,10 +1478,10 @@ def resource_analytics_instance_disable_oac(self, resource_analytics_instance_id "resourceAnalyticsInstanceId": resource_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 = { @@ -1491,7 +1490,7 @@ def resource_analytics_instance_disable_oac(self, resource_analytics_instance_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'), @@ -1580,7 +1579,7 @@ def resource_analytics_instance_enable_oac(self, resource_analytics_instance_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"resource_analytics_instance_enable_oac got unknown kwargs: {extra_kwargs!r}") @@ -1589,10 +1588,10 @@ def resource_analytics_instance_enable_oac(self, resource_analytics_instance_id, "resourceAnalyticsInstanceId": resource_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 = { @@ -1601,7 +1600,7 @@ def resource_analytics_instance_enable_oac(self, resource_analytics_instance_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'), @@ -1692,7 +1691,7 @@ def update_resource_analytics_instance(self, resource_analytics_instance_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_resource_analytics_instance got unknown kwargs: {extra_kwargs!r}") @@ -1701,10 +1700,10 @@ def update_resource_analytics_instance(self, resource_analytics_instance_id, upd "resourceAnalyticsInstanceId": resource_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 = { @@ -1713,7 +1712,7 @@ def update_resource_analytics_instance(self, resource_analytics_instance_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/resource_analytics/tenancy_attachment_client.py b/src/oci/resource_analytics/tenancy_attachment_client.py index a923041cd3..263ac5c2e3 100644 --- a/src/oci/resource_analytics/tenancy_attachment_client.py +++ b/src/oci/resource_analytics/tenancy_attachment_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 create_tenancy_attachment(self, create_tenancy_attachment_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_tenancy_attachment got unknown kwargs: {extra_kwargs!r}") @@ -182,7 +181,7 @@ def create_tenancy_attachment(self, create_tenancy_attachment_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'), @@ -273,7 +272,7 @@ def delete_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"delete_tenancy_attachment got unknown kwargs: {extra_kwargs!r}") @@ -282,10 +281,10 @@ def delete_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 = { @@ -294,7 +293,7 @@ def delete_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'), @@ -375,7 +374,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}") @@ -384,10 +383,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 = { @@ -395,7 +394,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'), @@ -521,7 +520,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}") @@ -556,14 +555,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'), @@ -656,7 +655,7 @@ def update_tenancy_attachment(self, tenancy_attachment_id, update_tenancy_attach "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_tenancy_attachment got unknown kwargs: {extra_kwargs!r}") @@ -665,10 +664,10 @@ def update_tenancy_attachment(self, tenancy_attachment_id, update_tenancy_attach "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 = { @@ -677,7 +676,7 @@ def update_tenancy_attachment(self, tenancy_attachment_id, update_tenancy_attach "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_manager/resource_manager_client.py b/src/oci/resource_manager/resource_manager_client.py index 46fab436c2..cb7608d8cc 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 @@ -187,7 +186,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}") @@ -196,16 +195,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", @@ -213,7 +212,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'), @@ -315,7 +314,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}") @@ -324,10 +323,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 = { @@ -337,7 +336,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'), @@ -440,7 +439,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}") @@ -449,10 +448,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 = { @@ -462,7 +461,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'), @@ -565,7 +564,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}") @@ -574,10 +573,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 = { @@ -587,7 +586,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'), @@ -690,7 +689,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}") @@ -699,10 +698,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 = { @@ -712,7 +711,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'), @@ -804,7 +803,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}") @@ -815,7 +814,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'), @@ -907,7 +906,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}") @@ -918,7 +917,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'), @@ -1010,7 +1009,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}") @@ -1021,7 +1020,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'), @@ -1117,7 +1116,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}") @@ -1128,7 +1127,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'), @@ -1220,7 +1219,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}") @@ -1231,7 +1230,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'), @@ -1323,7 +1322,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}") @@ -1332,10 +1331,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 = { @@ -1344,7 +1343,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'), @@ -1433,7 +1432,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}") @@ -1442,10 +1441,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 = { @@ -1454,7 +1453,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'), @@ -1543,7 +1542,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}") @@ -1552,10 +1551,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 = { @@ -1564,7 +1563,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'), @@ -1653,7 +1652,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}") @@ -1662,10 +1661,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 = { @@ -1674,7 +1673,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'), @@ -1775,7 +1774,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}") @@ -1784,10 +1783,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 = { @@ -1797,7 +1796,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'), @@ -1883,7 +1882,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}") @@ -1892,10 +1891,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 = { @@ -1903,7 +1902,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'), @@ -1988,7 +1987,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}") @@ -1997,10 +1996,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 = { @@ -2008,7 +2007,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'), @@ -2095,7 +2094,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}") @@ -2104,10 +2103,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 = { @@ -2115,7 +2114,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'), @@ -2242,7 +2241,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}") @@ -2251,10 +2250,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: @@ -2280,14 +2279,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'), @@ -2375,7 +2374,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}") @@ -2384,10 +2383,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 = { @@ -2395,7 +2394,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'), @@ -2481,7 +2480,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}") @@ -2490,10 +2489,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 = { @@ -2501,7 +2500,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'), @@ -2592,7 +2591,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}") @@ -2601,10 +2600,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: @@ -2617,14 +2616,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'), @@ -2711,7 +2710,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}") @@ -2720,10 +2719,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 = { @@ -2731,7 +2730,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'), @@ -2816,7 +2815,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}") @@ -2825,10 +2824,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 = { @@ -2836,7 +2835,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'), @@ -2933,7 +2932,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}") @@ -2942,16 +2941,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", @@ -2959,7 +2958,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'), @@ -3047,7 +3046,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}") @@ -3056,10 +3055,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 = { @@ -3067,7 +3066,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'), @@ -3153,7 +3152,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}") @@ -3162,10 +3161,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 = { @@ -3173,7 +3172,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'), @@ -3258,7 +3257,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}") @@ -3267,10 +3266,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 = { @@ -3278,7 +3277,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'), @@ -3363,7 +3362,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}") @@ -3372,10 +3371,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 = { @@ -3383,7 +3382,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'), @@ -3469,7 +3468,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}") @@ -3478,10 +3477,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 = { @@ -3489,7 +3488,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'), @@ -3575,7 +3574,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}") @@ -3584,10 +3583,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 = { @@ -3595,7 +3594,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'), @@ -3680,7 +3679,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}") @@ -3689,10 +3688,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 = { @@ -3700,7 +3699,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'), @@ -3833,7 +3832,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}") @@ -3862,14 +3861,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'), @@ -3981,7 +3980,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}") @@ -3990,10 +3989,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 = { @@ -4002,14 +4001,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'), @@ -4116,7 +4115,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}") @@ -4125,10 +4124,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 = { @@ -4136,14 +4135,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'), @@ -4292,7 +4291,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}") @@ -4329,14 +4328,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'), @@ -4471,7 +4470,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}") @@ -4500,14 +4499,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'), @@ -4596,7 +4595,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}") @@ -4604,14 +4603,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'), @@ -4723,7 +4722,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}") @@ -4732,10 +4731,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 = { @@ -4744,14 +4743,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'), @@ -4866,7 +4865,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}") @@ -4875,10 +4874,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 = { @@ -4887,14 +4886,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'), @@ -5036,7 +5035,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}") @@ -5072,14 +5071,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'), @@ -5159,7 +5158,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}") @@ -5169,7 +5168,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'), @@ -5303,7 +5302,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}") @@ -5332,14 +5331,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'), @@ -5425,7 +5424,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}") @@ -5433,14 +5432,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'), @@ -5551,7 +5550,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}") @@ -5560,10 +5559,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: @@ -5579,14 +5578,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'), @@ -5699,7 +5698,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}") @@ -5708,10 +5707,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: @@ -5727,14 +5726,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'), @@ -5841,7 +5840,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}") @@ -5852,14 +5851,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'), @@ -5953,7 +5952,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}") @@ -5962,10 +5961,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 = { @@ -5974,7 +5973,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'), @@ -6070,7 +6069,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}") @@ -6079,10 +6078,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 = { @@ -6091,7 +6090,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'), @@ -6187,7 +6186,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}") @@ -6196,10 +6195,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 = { @@ -6208,7 +6207,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'), @@ -6306,7 +6305,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}") @@ -6315,10 +6314,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 = { @@ -6327,7 +6326,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'), @@ -6423,7 +6422,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}") @@ -6432,10 +6431,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 = { @@ -6444,7 +6443,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_scheduler/schedule_client.py b/src/oci/resource_scheduler/schedule_client.py index d677415dc6..59d0826aaa 100644 --- a/src/oci/resource_scheduler/schedule_client.py +++ b/src/oci/resource_scheduler/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 @@ -180,7 +179,7 @@ def activate_schedule(self, schedule_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"activate_schedule got unknown kwargs: {extra_kwargs!r}") @@ -189,10 +188,10 @@ def activate_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 = { @@ -202,7 +201,7 @@ def activate_schedule(self, schedule_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'), @@ -293,7 +292,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}") @@ -302,10 +301,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 = { @@ -314,7 +313,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'), @@ -416,7 +415,7 @@ def change_schedule_compartment(self, schedule_id, change_schedule_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_schedule_compartment got unknown kwargs: {extra_kwargs!r}") @@ -425,10 +424,10 @@ def change_schedule_compartment(self, schedule_id, change_schedule_compartment_d "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 = { @@ -438,7 +437,7 @@ def change_schedule_compartment(self, schedule_id, change_schedule_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'), @@ -528,7 +527,7 @@ def create_schedule(self, create_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_schedule got unknown kwargs: {extra_kwargs!r}") @@ -539,7 +538,7 @@ def create_schedule(self, create_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'), @@ -638,7 +637,7 @@ def deactivate_schedule(self, schedule_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"deactivate_schedule got unknown kwargs: {extra_kwargs!r}") @@ -647,10 +646,10 @@ def deactivate_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 = { @@ -660,7 +659,7 @@ def deactivate_schedule(self, schedule_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'), @@ -751,7 +750,7 @@ def delete_schedule(self, 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_schedule got unknown kwargs: {extra_kwargs!r}") @@ -760,10 +759,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 = { @@ -772,7 +771,7 @@ def delete_schedule(self, 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'), @@ -853,7 +852,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}") @@ -862,10 +861,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 = { @@ -873,7 +872,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'), @@ -956,7 +955,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}") @@ -965,10 +964,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 = { @@ -976,7 +975,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'), @@ -1076,7 +1075,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}") @@ -1086,14 +1085,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'), @@ -1231,7 +1230,7 @@ def list_schedules(self, **kwargs): "opc_request_id", "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_schedules got unknown kwargs: {extra_kwargs!r}") @@ -1268,14 +1267,14 @@ def list_schedules(self, **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'), @@ -1386,7 +1385,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}") @@ -1395,10 +1394,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: @@ -1421,14 +1420,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'), @@ -1541,7 +1540,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}") @@ -1550,10 +1549,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: @@ -1576,14 +1575,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'), @@ -1723,7 +1722,7 @@ def list_work_requests(self, **kwargs): "schedule_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_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1760,14 +1759,14 @@ def list_work_requests(self, **kwargs): "sortBy": kwargs.get("sort_by", missing), "scheduleId": kwargs.get("schedule_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'), @@ -1860,7 +1859,7 @@ def update_schedule(self, schedule_id, update_schedule_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_schedule got unknown kwargs: {extra_kwargs!r}") @@ -1869,10 +1868,10 @@ def update_schedule(self, schedule_id, update_schedule_details, **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 = { @@ -1881,7 +1880,7 @@ def update_schedule(self, schedule_id, update_schedule_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/resource_search/resource_search_client.py b/src/oci/resource_search/resource_search_client.py index d709fa4bda..a23e776f6e 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 @@ -161,7 +160,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}") @@ -170,10 +169,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 = { @@ -181,7 +180,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'), @@ -265,7 +264,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}") @@ -274,14 +273,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'), @@ -374,7 +373,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}") @@ -384,14 +383,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 dff6f57f6e..0f35e4d876 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 @@ -180,7 +179,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}") @@ -189,10 +188,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: @@ -215,14 +214,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'), @@ -322,7 +321,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}") @@ -331,10 +330,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: @@ -357,14 +356,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'), @@ -447,7 +446,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}") @@ -456,10 +455,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 = { @@ -467,7 +466,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'), @@ -548,7 +547,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}") @@ -557,10 +556,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 = { @@ -568,7 +567,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'), @@ -649,7 +648,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}") @@ -658,10 +657,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 = { @@ -669,7 +668,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'), @@ -752,7 +751,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}") @@ -761,10 +760,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 = { @@ -772,7 +771,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'), @@ -855,7 +854,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}") @@ -864,10 +863,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 = { @@ -875,7 +874,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'), @@ -958,7 +957,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}") @@ -967,10 +966,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 = { @@ -978,7 +977,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 5b4edfdf9e..c9d6f9180e 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 @@ -179,7 +178,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}") @@ -188,10 +187,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 = { @@ -201,7 +200,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'), @@ -288,7 +287,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}") @@ -299,7 +298,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'), @@ -394,7 +393,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}") @@ -403,10 +402,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 = { @@ -416,7 +415,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'), @@ -493,7 +492,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}") @@ -502,10 +501,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 = { @@ -513,7 +512,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'), @@ -591,7 +590,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}") @@ -600,10 +599,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 = { @@ -611,7 +610,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'), @@ -725,7 +724,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}") @@ -768,14 +767,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'), @@ -872,7 +871,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}") @@ -881,10 +880,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 = { @@ -894,7 +893,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'), @@ -984,7 +983,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}") @@ -993,10 +992,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 = { @@ -1005,7 +1004,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 84c6029f7f..f41daec52e 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 @@ -179,7 +178,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}") @@ -188,10 +187,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 = { @@ -201,7 +200,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'), @@ -288,7 +287,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}") @@ -299,7 +298,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'), @@ -394,7 +393,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}") @@ -403,10 +402,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 = { @@ -416,7 +415,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'), @@ -504,7 +503,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}") @@ -513,16 +512,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", @@ -530,7 +529,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'), @@ -645,7 +644,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}") @@ -681,14 +680,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'), @@ -777,7 +776,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}") @@ -786,10 +785,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 = { @@ -798,7 +797,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 32eeaa8193..8370133fb7 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 @@ -179,7 +178,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}") @@ -188,10 +187,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 = { @@ -201,7 +200,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'), @@ -288,7 +287,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}") @@ -299,7 +298,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'), @@ -394,7 +393,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}") @@ -403,10 +402,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 = { @@ -416,7 +415,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'), @@ -493,7 +492,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}") @@ -502,10 +501,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 = { @@ -513,7 +512,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'), @@ -591,7 +590,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}") @@ -600,10 +599,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 = { @@ -611,7 +610,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'), @@ -689,7 +688,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}") @@ -698,10 +697,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 = { @@ -709,7 +708,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'), @@ -791,7 +790,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}") @@ -800,10 +799,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 = { @@ -812,7 +811,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'), @@ -930,7 +929,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}") @@ -974,14 +973,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'), @@ -1075,7 +1074,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}") @@ -1084,10 +1083,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 = { @@ -1097,7 +1096,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'), @@ -1199,7 +1198,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}") @@ -1208,10 +1207,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 = { @@ -1222,7 +1221,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'), @@ -1322,7 +1321,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}") @@ -1331,10 +1330,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 = { @@ -1344,7 +1343,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'), @@ -1444,7 +1443,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}") @@ -1453,10 +1452,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 = { @@ -1466,7 +1465,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'), @@ -1566,7 +1565,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}") @@ -1575,10 +1574,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 = { @@ -1588,7 +1587,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'), @@ -1685,7 +1684,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}") @@ -1694,10 +1693,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 = { @@ -1707,7 +1706,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'), @@ -1797,7 +1796,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}") @@ -1806,10 +1805,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 = { @@ -1818,7 +1817,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 4249cb1fd2..607cd1c9df 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 @@ -180,7 +179,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}") @@ -206,14 +205,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 b21565647d..bef0b6c5d8 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 @@ -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'), @@ -275,7 +274,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}") @@ -284,10 +283,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 = { @@ -295,7 +294,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'), @@ -393,7 +392,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}") @@ -402,10 +401,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: @@ -428,14 +427,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'), @@ -535,7 +534,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}") @@ -544,10 +543,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: @@ -570,14 +569,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'), @@ -693,7 +692,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}") @@ -736,14 +735,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 b3fa0c769b..095a1b90a1 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 @@ -164,7 +163,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}") @@ -173,10 +172,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 = { @@ -184,7 +183,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'), @@ -309,7 +308,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}") @@ -344,14 +343,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 d445e30b93..644929be19 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 @@ -190,7 +189,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}") @@ -199,10 +198,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 = { @@ -212,7 +211,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'), @@ -309,7 +308,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}") @@ -318,10 +317,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 = { @@ -330,7 +329,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'), @@ -442,7 +441,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}") @@ -453,7 +452,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'), @@ -556,7 +555,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}") @@ -565,10 +564,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 = { @@ -578,7 +577,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'), @@ -673,7 +672,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}") @@ -682,10 +681,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 = { @@ -694,7 +693,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'), @@ -777,7 +776,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}") @@ -786,10 +785,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 = { @@ -797,7 +796,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'), @@ -882,7 +881,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}") @@ -891,10 +890,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 = { @@ -902,7 +901,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'), @@ -1030,7 +1029,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}") @@ -1065,14 +1064,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'), @@ -1173,7 +1172,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}") @@ -1182,24 +1181,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'), @@ -1302,7 +1301,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}") @@ -1311,24 +1310,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'), @@ -1431,7 +1430,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}") @@ -1441,14 +1440,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'), @@ -1548,7 +1547,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}") @@ -1557,10 +1556,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 = { @@ -1569,7 +1568,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 c83f64528a..eae229f846 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 @@ -175,7 +174,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}") @@ -184,10 +183,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: @@ -202,14 +201,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'), @@ -307,7 +306,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}") @@ -326,14 +325,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'), @@ -438,7 +437,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}") @@ -447,10 +446,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: @@ -473,14 +472,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/security_attribute/security_attribute_client.py b/src/oci/security_attribute/security_attribute_client.py index a167090000..30ce126ef6 100644 --- a/src/oci/security_attribute/security_attribute_client.py +++ b/src/oci/security_attribute/security_attribute_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 bulk_delete_security_attributes(self, bulk_delete_security_attributes_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"bulk_delete_security_attributes got unknown kwargs: {extra_kwargs!r}") @@ -197,7 +196,7 @@ def bulk_delete_security_attributes(self, bulk_delete_security_attributes_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'), @@ -295,7 +294,7 @@ def bulk_edit_security_attributes(self, **kwargs): "opc_retry_token", "bulk_edit_security_attribute_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_security_attributes got unknown kwargs: {extra_kwargs!r}") @@ -306,7 +305,7 @@ def bulk_edit_security_attributes(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'), @@ -419,7 +418,7 @@ def cascading_delete_security_attribute_namespace(self, security_attribute_names "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_security_attribute_namespace got unknown kwargs: {extra_kwargs!r}") @@ -428,10 +427,10 @@ def cascading_delete_security_attribute_namespace(self, security_attribute_names "securityAttributeNamespaceId": security_attribute_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 = { @@ -441,7 +440,7 @@ def cascading_delete_security_attribute_namespace(self, security_attribute_names "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 change_security_attribute_namespace_compartment(self, security_attribute_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"change_security_attribute_namespace_compartment got unknown kwargs: {extra_kwargs!r}") @@ -555,10 +554,10 @@ def change_security_attribute_namespace_compartment(self, security_attribute_nam "securityAttributeNamespaceId": security_attribute_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 = { @@ -568,7 +567,7 @@ def change_security_attribute_namespace_compartment(self, security_attribute_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'), @@ -677,7 +676,7 @@ def create_security_attribute(self, security_attribute_namespace_id, create_secu "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_attribute got unknown kwargs: {extra_kwargs!r}") @@ -686,10 +685,10 @@ def create_security_attribute(self, security_attribute_namespace_id, create_secu "securityAttributeNamespaceId": security_attribute_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 = { @@ -698,7 +697,7 @@ def create_security_attribute(self, security_attribute_namespace_id, create_secu "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -803,7 +802,7 @@ def create_security_attribute_namespace(self, create_security_attribute_namespac "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_attribute_namespace got unknown kwargs: {extra_kwargs!r}") @@ -814,7 +813,7 @@ def create_security_attribute_namespace(self, create_security_attribute_namespac "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 delete_security_attribute(self, security_attribute_namespace_id, security_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"delete_security_attribute got unknown kwargs: {extra_kwargs!r}") @@ -937,10 +936,10 @@ def delete_security_attribute(self, security_attribute_namespace_id, security_at "securityAttributeName": security_attribute_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -950,7 +949,7 @@ def delete_security_attribute(self, security_attribute_namespace_id, security_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'), @@ -1047,7 +1046,7 @@ def delete_security_attribute_namespace(self, security_attribute_namespace_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"delete_security_attribute_namespace got unknown kwargs: {extra_kwargs!r}") @@ -1056,10 +1055,10 @@ def delete_security_attribute_namespace(self, security_attribute_namespace_id, * "securityAttributeNamespaceId": security_attribute_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 = { @@ -1069,7 +1068,7 @@ def delete_security_attribute_namespace(self, security_attribute_namespace_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'), @@ -1152,7 +1151,7 @@ def get_security_attribute(self, security_attribute_namespace_id, security_attri "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_attribute got unknown kwargs: {extra_kwargs!r}") @@ -1162,10 +1161,10 @@ def get_security_attribute(self, security_attribute_namespace_id, security_attri "securityAttributeName": security_attribute_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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 get_security_attribute(self, security_attribute_namespace_id, security_attri "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 get_security_attribute_namespace(self, security_attribute_namespace_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_security_attribute_namespace got unknown kwargs: {extra_kwargs!r}") @@ -1263,10 +1262,10 @@ def get_security_attribute_namespace(self, security_attribute_namespace_id, **kw "securityAttributeNamespaceId": security_attribute_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 = { @@ -1274,7 +1273,7 @@ def get_security_attribute_namespace(self, security_attribute_namespace_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'), @@ -1356,7 +1355,7 @@ def get_security_attribute_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_security_attribute_work_request got unknown kwargs: {extra_kwargs!r}") @@ -1365,10 +1364,10 @@ def get_security_attribute_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 = { @@ -1376,7 +1375,7 @@ def get_security_attribute_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'), @@ -1502,7 +1501,7 @@ def list_security_attribute_namespaces(self, **kwargs): "compartment_id_in_subtree", "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_attribute_namespaces got unknown kwargs: {extra_kwargs!r}") @@ -1538,14 +1537,14 @@ def list_security_attribute_namespaces(self, **kwargs): "compartmentIdInSubtree": kwargs.get("compartment_id_in_subtree", 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'), @@ -1634,7 +1633,7 @@ def list_security_attribute_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_security_attribute_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -1643,24 +1642,24 @@ def list_security_attribute_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'), @@ -1751,7 +1750,7 @@ def list_security_attribute_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_security_attribute_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -1760,24 +1759,24 @@ def list_security_attribute_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'), @@ -1875,7 +1874,7 @@ def list_security_attribute_work_requests(self, **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_security_attribute_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1886,14 +1885,14 @@ def list_security_attribute_work_requests(self, **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'), @@ -1988,7 +1987,7 @@ def list_security_attributes(self, security_attribute_namespace_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_security_attributes got unknown kwargs: {extra_kwargs!r}") @@ -1997,10 +1996,10 @@ def list_security_attributes(self, security_attribute_namespace_id, **kwargs): "securityAttributeNamespaceId": security_attribute_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: @@ -2015,14 +2014,14 @@ def list_security_attributes(self, security_attribute_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", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2126,7 +2125,7 @@ def update_security_attribute(self, security_attribute_namespace_id, security_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"update_security_attribute got unknown kwargs: {extra_kwargs!r}") @@ -2136,10 +2135,10 @@ def update_security_attribute(self, security_attribute_namespace_id, security_at "securityAttributeName": security_attribute_name } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_security_attribute(self, security_attribute_namespace_id, security_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'), @@ -2261,7 +2260,7 @@ def update_security_attribute_namespace(self, security_attribute_namespace_id, 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"update_security_attribute_namespace got unknown kwargs: {extra_kwargs!r}") @@ -2270,10 +2269,10 @@ def update_security_attribute_namespace(self, security_attribute_namespace_id, u "securityAttributeNamespaceId": security_attribute_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 = { @@ -2283,7 +2282,7 @@ def update_security_attribute_namespace(self, security_attribute_namespace_id, 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/service_catalog/service_catalog_client.py b/src/oci/service_catalog/service_catalog_client.py index 67c4b0edd2..b9f491b0d7 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 @@ -171,7 +170,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}") @@ -180,10 +179,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 = { @@ -192,7 +191,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'), @@ -280,7 +279,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}") @@ -289,10 +288,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 = { @@ -301,7 +300,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'), @@ -389,7 +388,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}") @@ -398,10 +397,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 = { @@ -410,7 +409,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'), @@ -496,7 +495,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}") @@ -507,7 +506,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'), @@ -594,7 +593,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}") @@ -605,7 +604,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'), @@ -692,7 +691,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}") @@ -703,7 +702,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'), @@ -789,7 +788,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}") @@ -798,10 +797,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 = { @@ -810,7 +809,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'), @@ -893,7 +892,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}") @@ -902,10 +901,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 = { @@ -914,7 +913,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'), @@ -997,7 +996,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}") @@ -1006,10 +1005,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 = { @@ -1018,7 +1017,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'), @@ -1095,7 +1094,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}") @@ -1103,14 +1102,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'), @@ -1189,7 +1188,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}") @@ -1198,10 +1197,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 = { @@ -1209,7 +1208,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'), @@ -1288,7 +1287,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}") @@ -1297,10 +1296,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 = { @@ -1308,7 +1307,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'), @@ -1387,7 +1386,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}") @@ -1396,10 +1395,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 = { @@ -1407,7 +1406,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'), @@ -1486,7 +1485,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}") @@ -1495,10 +1494,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 = { @@ -1506,7 +1505,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'), @@ -1585,7 +1584,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}") @@ -1594,10 +1593,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 = { @@ -1605,7 +1604,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'), @@ -1684,7 +1683,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}") @@ -1693,10 +1692,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 = { @@ -1704,7 +1703,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'), @@ -1783,7 +1782,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}") @@ -1792,10 +1791,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 = { @@ -1803,7 +1802,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'), @@ -1932,7 +1931,7 @@ def list_all_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_all_applications got unknown kwargs: {extra_kwargs!r}") @@ -1973,14 +1972,14 @@ def list_all_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'), @@ -2114,7 +2113,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}") @@ -2156,14 +2155,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'), @@ -2279,7 +2278,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}") @@ -2316,14 +2315,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'), @@ -2431,7 +2430,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}") @@ -2459,14 +2458,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'), @@ -2578,7 +2577,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}") @@ -2607,14 +2606,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'), @@ -2727,7 +2726,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}") @@ -2763,14 +2762,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'), @@ -2869,7 +2868,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}") @@ -2878,10 +2877,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: @@ -2904,14 +2903,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'), @@ -3012,7 +3011,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}") @@ -3021,10 +3020,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: @@ -3047,14 +3046,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'), @@ -3170,7 +3169,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}") @@ -3206,14 +3205,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'), @@ -3301,7 +3300,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}") @@ -3310,10 +3309,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 = { @@ -3322,7 +3321,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'), @@ -3412,7 +3411,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}") @@ -3421,10 +3420,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 = { @@ -3433,7 +3432,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 4ad99158e1..f9a16ff5af 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 @@ -171,7 +170,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}") @@ -180,23 +179,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'), @@ -315,7 +314,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}") @@ -344,14 +343,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/signer.py b/src/oci/signer.py index 03e472598b..3130f9a16d 100644 --- a/src/oci/signer.py +++ b/src/oci/signer.py @@ -10,8 +10,8 @@ import io import functools import os +import urllib.parse -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 3f23023c10..6d5040bd82 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 @@ -179,7 +178,7 @@ def apply_monitoring_template(self, monitoring_template_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"apply_monitoring_template got unknown kwargs: {extra_kwargs!r}") @@ -188,10 +187,10 @@ def apply_monitoring_template(self, monitoring_template_id, **kwargs): "monitoringTemplateId": monitoring_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 = { @@ -201,7 +200,7 @@ def apply_monitoring_template(self, monitoring_template_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'), @@ -297,7 +296,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}") @@ -309,7 +308,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'), @@ -416,7 +415,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}") @@ -425,10 +424,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 = { @@ -438,7 +437,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'), @@ -540,7 +539,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}") @@ -549,10 +548,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 = { @@ -562,7 +561,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'), @@ -662,7 +661,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}") @@ -671,10 +670,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 = { @@ -684,7 +683,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'), @@ -783,7 +782,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}") @@ -792,10 +791,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 = { @@ -805,7 +804,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'), @@ -904,7 +903,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}") @@ -913,10 +912,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 = { @@ -926,7 +925,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'), @@ -1019,7 +1018,7 @@ def create_alarm_condition(self, create_alarm_condition_details, monitoring_temp "opc_retry_token", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_condition got unknown kwargs: {extra_kwargs!r}") @@ -1028,10 +1027,10 @@ def create_alarm_condition(self, create_alarm_condition_details, monitoring_temp "monitoringTemplateId": monitoring_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 = { @@ -1040,7 +1039,7 @@ def create_alarm_condition(self, create_alarm_condition_details, monitoring_temp "opc-retry-token": kwargs.get("opc_retry_token", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_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}") @@ -1141,7 +1140,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'), @@ -1235,7 +1234,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}") @@ -1246,7 +1245,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'), @@ -1334,7 +1333,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}") @@ -1345,7 +1344,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'), @@ -1432,7 +1431,7 @@ def create_maintenance_window(self, create_maintenance_window_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_maintenance_window got unknown kwargs: {extra_kwargs!r}") @@ -1443,7 +1442,7 @@ def create_maintenance_window(self, create_maintenance_window_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'), @@ -1531,7 +1530,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}") @@ -1542,7 +1541,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'), @@ -1637,7 +1636,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}") @@ -1649,7 +1648,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'), @@ -1735,7 +1734,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}") @@ -1746,7 +1745,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'), @@ -1834,7 +1833,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}") @@ -1845,7 +1844,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'), @@ -1933,7 +1932,7 @@ def create_monitoring_template(self, create_monitoring_template_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_monitoring_template got unknown kwargs: {extra_kwargs!r}") @@ -1944,7 +1943,7 @@ def create_monitoring_template(self, create_monitoring_template_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'), @@ -2032,7 +2031,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}") @@ -2043,7 +2042,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'), @@ -2138,7 +2137,7 @@ def delete_alarm_condition(self, alarm_condition_id, monitoring_template_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_alarm_condition got unknown kwargs: {extra_kwargs!r}") @@ -2148,10 +2147,10 @@ def delete_alarm_condition(self, alarm_condition_id, monitoring_template_id, **k "monitoringTemplateId": monitoring_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 = { @@ -2160,7 +2159,7 @@ def delete_alarm_condition(self, alarm_condition_id, monitoring_template_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'), @@ -2243,7 +2242,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}") @@ -2252,10 +2251,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 = { @@ -2264,7 +2263,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'), @@ -2349,7 +2348,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}") @@ -2358,10 +2357,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 = { @@ -2370,7 +2369,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'), @@ -2455,7 +2454,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}") @@ -2464,10 +2463,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 = { @@ -2476,7 +2475,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'), @@ -2563,7 +2562,7 @@ def delete_maintenance_window(self, maintenance_window_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"delete_maintenance_window got unknown kwargs: {extra_kwargs!r}") @@ -2572,10 +2571,10 @@ def delete_maintenance_window(self, maintenance_window_id, **kwargs): "maintenanceWindowId": maintenance_window_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is 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_maintenance_window(self, maintenance_window_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2669,7 +2668,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}") @@ -2678,10 +2677,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 = { @@ -2690,7 +2689,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'), @@ -2785,7 +2784,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}") @@ -2794,16 +2793,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", @@ -2811,7 +2810,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'), @@ -2900,7 +2899,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}") @@ -2909,10 +2908,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 = { @@ -2921,7 +2920,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'), @@ -3006,7 +3005,7 @@ def delete_monitoring_template(self, monitoring_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_monitoring_template got unknown kwargs: {extra_kwargs!r}") @@ -3015,10 +3014,10 @@ def delete_monitoring_template(self, monitoring_template_id, **kwargs): "monitoringTemplateId": monitoring_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 = { @@ -3027,7 +3026,7 @@ def delete_monitoring_template(self, monitoring_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'), @@ -3110,7 +3109,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}") @@ -3119,10 +3118,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 = { @@ -3131,7 +3130,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'), @@ -3227,7 +3226,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}") @@ -3236,10 +3235,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 = { @@ -3249,7 +3248,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'), @@ -3346,7 +3345,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}") @@ -3355,10 +3354,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 = { @@ -3368,7 +3367,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'), @@ -3462,7 +3461,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}") @@ -3474,7 +3473,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'), @@ -3571,7 +3570,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}") @@ -3580,10 +3579,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 = { @@ -3593,7 +3592,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'), @@ -3690,7 +3689,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}") @@ -3699,10 +3698,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 = { @@ -3712,7 +3711,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'), @@ -3813,7 +3812,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}") @@ -3822,10 +3821,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 = { @@ -3835,7 +3834,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'), @@ -3933,7 +3932,7 @@ def export_monitoring_template(self, monitoring_template_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"export_monitoring_template got unknown kwargs: {extra_kwargs!r}") @@ -3942,10 +3941,10 @@ def export_monitoring_template(self, monitoring_template_id, **kwargs): "monitoringTemplateId": monitoring_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 = { @@ -3955,7 +3954,7 @@ def export_monitoring_template(self, monitoring_template_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'), @@ -4042,7 +4041,7 @@ def get_alarm_condition(self, alarm_condition_id, monitoring_template_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_alarm_condition got unknown kwargs: {extra_kwargs!r}") @@ -4052,10 +4051,10 @@ def get_alarm_condition(self, alarm_condition_id, monitoring_template_id, **kwar "monitoringTemplateId": monitoring_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 = { @@ -4063,7 +4062,7 @@ def get_alarm_condition(self, alarm_condition_id, monitoring_template_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'), @@ -4142,7 +4141,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}") @@ -4151,10 +4150,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 = { @@ -4162,7 +4161,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'), @@ -4241,7 +4240,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}") @@ -4250,10 +4249,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 = { @@ -4261,7 +4260,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'), @@ -4340,7 +4339,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}") @@ -4349,10 +4348,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 = { @@ -4360,7 +4359,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'), @@ -4443,7 +4442,7 @@ def get_maintenance_window(self, maintenance_window_id, **kwargs): "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_window got unknown kwargs: {extra_kwargs!r}") @@ -4452,10 +4451,10 @@ def get_maintenance_window(self, maintenance_window_id, **kwargs): "maintenanceWindowId": maintenance_window_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -4463,7 +4462,7 @@ def get_maintenance_window(self, maintenance_window_id, **kwargs): "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -4544,7 +4543,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}") @@ -4553,10 +4552,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 = { @@ -4564,7 +4563,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'), @@ -4647,7 +4646,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}") @@ -4656,10 +4655,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 = { @@ -4667,7 +4666,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'), @@ -4750,7 +4749,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}") @@ -4759,10 +4758,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 = { @@ -4770,7 +4769,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'), @@ -4853,7 +4852,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}") @@ -4862,10 +4861,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 = { @@ -4873,7 +4872,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'), @@ -4954,7 +4953,7 @@ def get_monitoring_template(self, monitoring_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_monitoring_template got unknown kwargs: {extra_kwargs!r}") @@ -4963,10 +4962,10 @@ def get_monitoring_template(self, monitoring_template_id, **kwargs): "monitoringTemplateId": monitoring_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 = { @@ -4974,7 +4973,7 @@ def get_monitoring_template(self, monitoring_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'), @@ -5053,7 +5052,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}") @@ -5062,10 +5061,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 = { @@ -5073,7 +5072,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'), @@ -5154,7 +5153,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}") @@ -5163,10 +5162,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 = { @@ -5174,7 +5173,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'), @@ -5304,7 +5303,7 @@ def list_alarm_conditions(self, monitoring_template_id, **kwargs): "metric_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_alarm_conditions got unknown kwargs: {extra_kwargs!r}") @@ -5313,10 +5312,10 @@ def list_alarm_conditions(self, monitoring_template_id, **kwargs): "monitoringTemplateId": monitoring_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') if 'sort_by' in kwargs: @@ -5357,14 +5356,14 @@ def list_alarm_conditions(self, monitoring_template_id, **kwargs): "resourceTypes": self.base_client.generate_collection_format_param(kwargs.get("resource_types", missing), 'multi'), "metricName": self.base_client.generate_collection_format_param(kwargs.get("metric_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'), @@ -5498,7 +5497,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}") @@ -5530,14 +5529,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'), @@ -5662,7 +5661,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}") @@ -5705,14 +5704,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'), @@ -5831,7 +5830,7 @@ def list_defined_monitoring_templates(self, compartment_id, **kwargs): "resource_types", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"list_defined_monitoring_templates got unknown kwargs: {extra_kwargs!r}") @@ -5859,14 +5858,14 @@ def list_defined_monitoring_templates(self, compartment_id, **kwargs): "resourceTypes": self.base_client.generate_collection_format_param(kwargs.get("resource_types", missing), 'multi'), "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'), @@ -5979,7 +5978,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}") @@ -5988,10 +5987,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: @@ -6022,14 +6021,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'), @@ -6142,7 +6141,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}") @@ -6169,14 +6168,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'), @@ -6300,7 +6299,7 @@ def list_maintenance_windows(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_maintenance_windows got unknown kwargs: {extra_kwargs!r}") @@ -6343,14 +6342,14 @@ def list_maintenance_windows(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'), @@ -6487,7 +6486,7 @@ def list_metric_extensions(self, **kwargs): "metric_extension_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}") @@ -6533,14 +6532,14 @@ def list_metric_extensions(self, **kwargs): "enabledOnResourceId": kwargs.get("enabled_on_resource_id", missing), "metricExtensionId": kwargs.get("metric_extension_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'), @@ -6657,7 +6656,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}") @@ -6691,14 +6690,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'), @@ -6872,7 +6871,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}") @@ -6927,14 +6926,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'), @@ -7056,7 +7055,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}") @@ -7092,14 +7091,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'), @@ -7240,7 +7239,7 @@ def list_monitoring_templates(self, **kwargs): "metric_name", "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"list_monitoring_templates got unknown kwargs: {extra_kwargs!r}") @@ -7287,14 +7286,14 @@ def list_monitoring_templates(self, **kwargs): "metricName": self.base_client.generate_collection_format_param(kwargs.get("metric_name", missing), 'multi'), "namespace": self.base_client.generate_collection_format_param(kwargs.get("namespace", 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'), @@ -7405,7 +7404,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}") @@ -7432,14 +7431,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'), @@ -7548,7 +7547,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}") @@ -7557,10 +7556,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: @@ -7583,14 +7582,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'), @@ -7701,7 +7700,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}") @@ -7710,10 +7709,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: @@ -7736,14 +7735,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'), @@ -7866,7 +7865,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}") @@ -7902,14 +7901,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'), @@ -8013,7 +8012,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}") @@ -8022,10 +8021,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 = { @@ -8035,7 +8034,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'), @@ -8133,7 +8132,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}") @@ -8142,10 +8141,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 = { @@ -8155,7 +8154,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'), @@ -8277,7 +8276,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}") @@ -8320,14 +8319,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'), @@ -8423,7 +8422,7 @@ def request_summarized_metric_extensions_metrics(self, request_summarized_metric "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_metric_extensions_metrics got unknown kwargs: {extra_kwargs!r}") @@ -8432,14 +8431,14 @@ def request_summarized_metric_extensions_metrics(self, request_summarized_metric "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'), @@ -8537,7 +8536,7 @@ def request_summarized_metric_extensions_resources(self, request_summarized_metr "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_metric_extensions_resources got unknown kwargs: {extra_kwargs!r}") @@ -8546,14 +8545,14 @@ def request_summarized_metric_extensions_resources(self, request_summarized_metr "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'), @@ -8644,7 +8643,7 @@ def retry_failed_maintenance_window_operation(self, maintenance_window_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"retry_failed_maintenance_window_operation got unknown kwargs: {extra_kwargs!r}") @@ -8653,10 +8652,10 @@ def retry_failed_maintenance_window_operation(self, maintenance_window_id, **kwa "maintenanceWindowId": maintenance_window_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -8665,7 +8664,7 @@ def retry_failed_maintenance_window_operation(self, maintenance_window_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'), @@ -8799,7 +8798,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}") @@ -8810,7 +8809,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", @@ -8819,7 +8818,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'), @@ -8933,7 +8932,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}") @@ -8942,7 +8941,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", @@ -8951,7 +8950,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'), @@ -9084,7 +9083,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}") @@ -9093,10 +9092,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: @@ -9119,7 +9118,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", @@ -9128,7 +9127,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'), @@ -9270,7 +9269,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}") @@ -9281,7 +9280,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", @@ -9290,7 +9289,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'), @@ -9382,7 +9381,7 @@ def stop_maintenance_window(self, maintenance_window_id, **kwargs): "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_maintenance_window got unknown kwargs: {extra_kwargs!r}") @@ -9391,10 +9390,10 @@ def stop_maintenance_window(self, maintenance_window_id, **kwargs): "maintenanceWindowId": maintenance_window_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -9403,7 +9402,7 @@ def stop_maintenance_window(self, maintenance_window_id, **kwargs): "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9499,7 +9498,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}") @@ -9508,10 +9507,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 = { @@ -9521,7 +9520,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'), @@ -9619,7 +9618,7 @@ def unapply_monitoring_template(self, monitoring_template_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"unapply_monitoring_template got unknown kwargs: {extra_kwargs!r}") @@ -9628,10 +9627,10 @@ def unapply_monitoring_template(self, monitoring_template_id, **kwargs): "monitoringTemplateId": monitoring_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 = { @@ -9641,7 +9640,7 @@ def unapply_monitoring_template(self, monitoring_template_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'), @@ -9737,7 +9736,7 @@ def update_alarm_condition(self, update_alarm_condition_details, alarm_condition "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_condition got unknown kwargs: {extra_kwargs!r}") @@ -9747,10 +9746,10 @@ def update_alarm_condition(self, update_alarm_condition_details, alarm_condition "monitoringTemplateId": monitoring_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 = { @@ -9759,7 +9758,7 @@ def update_alarm_condition(self, update_alarm_condition_details, alarm_condition "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -9866,7 +9865,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}") @@ -9875,10 +9874,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 = { @@ -9888,7 +9887,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'), @@ -9979,7 +9978,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}") @@ -9988,10 +9987,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 = { @@ -10000,7 +9999,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'), @@ -10092,7 +10091,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}") @@ -10101,10 +10100,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 = { @@ -10113,7 +10112,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'), @@ -10209,7 +10208,7 @@ def update_maintenance_window(self, maintenance_window_id, update_maintenance_wi "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not 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_window got unknown kwargs: {extra_kwargs!r}") @@ -10218,10 +10217,10 @@ def update_maintenance_window(self, maintenance_window_id, update_maintenance_wi "maintenanceWindowId": maintenance_window_id } - path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + path_params = {k: v for (k, v) in path_params.items() if v is not missing} - for (k, v) in six.iteritems(path_params): - if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + for (k, v) in path_params.items(): + if v is None or (isinstance(v, str) and len(v.strip()) == 0): raise ValueError(f'Parameter {k} cannot be None, whitespace or empty string') header_params = { @@ -10230,7 +10229,7 @@ def update_maintenance_window(self, maintenance_window_id, update_maintenance_wi "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_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}") @@ -10329,10 +10328,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 = { @@ -10341,7 +10340,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'), @@ -10437,7 +10436,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}") @@ -10446,10 +10445,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 = { @@ -10458,7 +10457,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'), @@ -10550,7 +10549,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}") @@ -10559,10 +10558,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 = { @@ -10571,7 +10570,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'), @@ -10665,7 +10664,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}") @@ -10674,10 +10673,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 = { @@ -10686,7 +10685,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'), @@ -10778,7 +10777,7 @@ def update_monitoring_template(self, monitoring_template_id, update_monitoring_t "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_monitoring_template got unknown kwargs: {extra_kwargs!r}") @@ -10787,10 +10786,10 @@ def update_monitoring_template(self, monitoring_template_id, update_monitoring_t "monitoringTemplateId": monitoring_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 = { @@ -10799,7 +10798,7 @@ def update_monitoring_template(self, monitoring_template_id, update_monitoring_t "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -10889,7 +10888,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}") @@ -10898,10 +10897,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 = { @@ -10910,7 +10909,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 33a609a44b..162b09598f 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 @@ -168,7 +167,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}") @@ -177,10 +176,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 = { @@ -189,7 +188,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'), @@ -277,7 +276,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}") @@ -286,10 +285,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 = { @@ -298,7 +297,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'), @@ -384,7 +383,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}") @@ -393,10 +392,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 = { @@ -405,7 +404,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'), @@ -489,7 +488,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}") @@ -500,7 +499,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'), @@ -584,7 +583,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}") @@ -594,7 +593,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'), @@ -679,7 +678,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}") @@ -690,7 +689,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'), @@ -778,7 +777,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}") @@ -787,10 +786,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 = { @@ -799,7 +798,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'), @@ -884,7 +883,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}") @@ -893,10 +892,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 = { @@ -905,7 +904,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'), @@ -987,7 +986,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}") @@ -996,10 +995,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 = { @@ -1008,7 +1007,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'), @@ -1085,7 +1084,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}") @@ -1094,10 +1093,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 = { @@ -1105,7 +1104,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'), @@ -1184,7 +1183,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}") @@ -1193,10 +1192,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 = { @@ -1204,7 +1203,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'), @@ -1283,7 +1282,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}") @@ -1292,10 +1291,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 = { @@ -1303,7 +1302,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'), @@ -1416,7 +1415,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}") @@ -1452,14 +1451,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'), @@ -1572,7 +1571,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}") @@ -1608,14 +1607,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'), @@ -1736,7 +1735,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}") @@ -1773,14 +1772,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'), @@ -1866,7 +1865,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}") @@ -1875,10 +1874,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 = { @@ -1887,7 +1886,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'), @@ -1975,7 +1974,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}") @@ -1984,10 +1983,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 = { @@ -1996,7 +1995,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'), @@ -2084,7 +2083,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}") @@ -2093,10 +2092,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 = { @@ -2105,7 +2104,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 f3af6aba96..f0245f2382 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 @@ -161,7 +160,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}") @@ -170,23 +169,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'), @@ -270,7 +269,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}") @@ -279,23 +278,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'), @@ -383,7 +382,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}") @@ -392,10 +391,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 = { @@ -403,7 +402,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'), @@ -487,7 +486,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}") @@ -496,10 +495,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 = { @@ -507,7 +506,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'), @@ -591,7 +590,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}") @@ -601,10 +600,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 = { @@ -612,7 +611,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'), @@ -701,7 +700,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}") @@ -710,24 +709,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'), @@ -814,7 +813,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}") @@ -823,10 +822,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 = { @@ -834,7 +833,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'), @@ -921,7 +920,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}") @@ -931,10 +930,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 = { @@ -942,7 +941,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 369ad0c3c3..c8452db110 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 @@ -168,7 +167,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}") @@ -179,7 +178,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'), @@ -264,7 +263,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}") @@ -273,10 +272,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 = { @@ -285,7 +284,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'), @@ -359,7 +358,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}") @@ -368,10 +367,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 = { @@ -379,7 +378,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'), @@ -498,7 +497,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}") @@ -542,14 +541,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'), @@ -636,7 +635,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}") @@ -645,10 +644,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 = { @@ -657,7 +656,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 f6910177f3..cf341009d4 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 @@ -168,7 +167,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}") @@ -179,7 +178,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'), @@ -264,7 +263,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}") @@ -273,10 +272,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 = { @@ -285,7 +284,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'), @@ -359,7 +358,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}") @@ -368,10 +367,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 = { @@ -379,7 +378,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'), @@ -496,7 +495,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}") @@ -533,14 +532,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'), @@ -627,7 +626,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}") @@ -636,10 +635,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 = { @@ -648,7 +647,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 33b69b7a35..e77c68599f 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 @@ -179,7 +178,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}") @@ -189,10 +188,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 = { @@ -202,7 +201,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'), @@ -296,7 +295,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}") @@ -306,10 +305,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 = { @@ -319,7 +318,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 d729bb6e67..2f419dbed6 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 @@ -168,7 +167,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}") @@ -177,10 +176,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 = { @@ -189,7 +188,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'), @@ -263,7 +262,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}") @@ -272,10 +271,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 = { @@ -283,7 +282,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'), @@ -384,7 +383,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}") @@ -411,14 +410,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 5851470db1..fb3217a3ea 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 @@ -171,7 +170,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}") @@ -180,10 +179,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 = { @@ -192,7 +191,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'), @@ -269,7 +268,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}") @@ -278,10 +277,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 = { @@ -289,7 +288,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 1cac0baeff..fdbd411bbd 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 @@ -179,7 +178,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}") @@ -188,16 +187,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", @@ -206,7 +205,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'), @@ -293,7 +292,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}") @@ -304,7 +303,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'), @@ -395,7 +394,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}") @@ -404,10 +403,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 = { @@ -417,7 +416,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'), @@ -492,7 +491,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}") @@ -501,10 +500,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 = { @@ -512,7 +511,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'), @@ -591,7 +590,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}") @@ -601,10 +600,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 = { @@ -612,7 +611,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'), @@ -696,7 +695,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}") @@ -705,24 +704,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'), @@ -808,7 +807,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}") @@ -818,14 +817,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'), @@ -909,7 +908,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}") @@ -918,10 +917,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 = { @@ -930,7 +929,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'), @@ -1023,7 +1022,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}") @@ -1032,16 +1031,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", @@ -1050,7 +1049,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'), @@ -1148,7 +1147,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}") @@ -1157,10 +1156,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 = { @@ -1170,7 +1169,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 09e71ccd99..bb628453e2 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 @@ -176,7 +175,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}") @@ -185,10 +184,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 = { @@ -198,7 +197,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'), @@ -273,7 +272,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}") @@ -282,10 +281,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 = { @@ -293,7 +292,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'), @@ -385,7 +384,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}") @@ -394,10 +393,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 = { @@ -407,7 +406,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'), @@ -504,7 +503,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}") @@ -530,14 +529,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'), @@ -624,7 +623,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}") @@ -633,10 +632,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 = { @@ -645,7 +644,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 7b2ac9e6ac..46bf918c32 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 @@ -176,7 +175,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}") @@ -185,10 +184,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 = { @@ -198,7 +197,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'), @@ -281,7 +280,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}") @@ -292,7 +291,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'), @@ -369,7 +368,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}") @@ -378,10 +377,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 = { @@ -389,7 +388,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'), @@ -508,7 +507,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}") @@ -552,14 +551,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'), @@ -646,7 +645,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}") @@ -655,10 +654,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 = { @@ -667,7 +666,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 e3fd125d05..96f11f0da3 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 @@ -176,7 +175,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}") @@ -188,7 +187,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'), @@ -273,7 +272,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}") @@ -282,10 +281,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 = { @@ -294,7 +293,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'), @@ -368,7 +367,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}") @@ -377,10 +376,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 = { @@ -388,7 +387,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'), @@ -464,7 +463,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}") @@ -473,10 +472,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 = { @@ -484,7 +483,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'), @@ -560,7 +559,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}") @@ -569,10 +568,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 = { @@ -580,7 +579,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'), @@ -679,7 +678,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}") @@ -688,10 +687,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: @@ -714,14 +713,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'), @@ -834,7 +833,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}") @@ -869,14 +868,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'), @@ -956,7 +955,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}") @@ -965,23 +964,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'), @@ -1082,7 +1081,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}") @@ -1091,10 +1090,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: @@ -1117,14 +1116,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'), @@ -1241,7 +1240,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}") @@ -1277,14 +1276,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'), @@ -1394,7 +1393,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}") @@ -1429,14 +1428,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 8c06d5d257..01ae21ff12 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 @@ -160,7 +159,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}") @@ -169,10 +168,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 = { @@ -180,7 +179,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'), @@ -270,7 +269,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}") @@ -279,10 +278,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: @@ -297,14 +296,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'), @@ -396,7 +395,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}") @@ -405,10 +404,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: @@ -423,14 +422,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'), @@ -522,7 +521,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}") @@ -540,14 +539,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 d1e0c6d719..a9cf87eeed 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 @@ -163,7 +162,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}") @@ -172,23 +171,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'), @@ -274,7 +273,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}") @@ -290,14 +289,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'), @@ -437,7 +436,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}") @@ -480,14 +479,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'), @@ -580,7 +579,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}") @@ -598,14 +597,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'), @@ -694,7 +693,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}") @@ -704,14 +703,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 d3a6a07212..5acffa80df 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 @@ -188,7 +187,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}") @@ -216,14 +215,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'), @@ -329,7 +328,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}") @@ -357,14 +356,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 9c06861e1f..0d0ec67fe3 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 @@ -186,7 +185,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}") @@ -195,17 +194,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", @@ -214,7 +213,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'), @@ -309,7 +308,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}") @@ -318,17 +317,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", @@ -336,7 +335,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'), @@ -444,7 +443,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}") @@ -453,10 +452,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: @@ -489,14 +488,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'), @@ -597,7 +596,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}") @@ -606,10 +605,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: @@ -633,14 +632,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'), @@ -749,7 +748,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}") @@ -758,10 +757,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: @@ -787,14 +786,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'), @@ -875,7 +874,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}") @@ -884,23 +883,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 b62305734d..7dec5992c4 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 @@ -195,7 +194,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}") @@ -225,14 +224,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 dd61e55196..3d621112f1 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 @@ -169,7 +168,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}") @@ -180,7 +179,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'), @@ -269,7 +268,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}") @@ -278,10 +277,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 = { @@ -290,7 +289,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'), @@ -378,7 +377,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}") @@ -389,7 +388,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'), @@ -475,7 +474,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}") @@ -486,7 +485,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'), @@ -572,7 +571,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}") @@ -583,7 +582,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'), @@ -669,7 +668,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}") @@ -678,10 +677,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 = { @@ -690,7 +689,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'), @@ -779,7 +778,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}") @@ -789,16 +788,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", @@ -806,7 +805,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'), @@ -891,7 +890,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}") @@ -900,10 +899,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 = { @@ -912,7 +911,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'), @@ -995,7 +994,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}") @@ -1004,10 +1003,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 = { @@ -1016,7 +1015,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'), @@ -1099,7 +1098,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}") @@ -1108,10 +1107,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 = { @@ -1120,7 +1119,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'), @@ -1195,7 +1194,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}") @@ -1204,10 +1203,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 = { @@ -1215,7 +1214,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'), @@ -1298,7 +1297,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}") @@ -1308,23 +1307,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'), @@ -1403,7 +1402,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}") @@ -1412,10 +1411,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 = { @@ -1423,7 +1422,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'), @@ -1500,7 +1499,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}") @@ -1509,10 +1508,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 = { @@ -1520,7 +1519,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'), @@ -1597,7 +1596,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}") @@ -1606,10 +1605,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 = { @@ -1617,7 +1616,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'), @@ -1694,7 +1693,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}") @@ -1703,10 +1702,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 = { @@ -1714,7 +1713,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'), @@ -1815,7 +1814,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}") @@ -1842,14 +1841,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'), @@ -1958,7 +1957,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}") @@ -1967,10 +1966,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: @@ -1994,7 +1993,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", @@ -2002,7 +2001,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'), @@ -2103,7 +2102,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}") @@ -2129,14 +2128,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'), @@ -2234,7 +2233,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}") @@ -2260,14 +2259,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'), @@ -2369,7 +2368,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}") @@ -2396,14 +2395,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'), @@ -2501,7 +2500,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}") @@ -2527,14 +2526,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'), @@ -2611,7 +2610,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}") @@ -2620,10 +2619,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 = { @@ -2631,7 +2630,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'), @@ -2712,7 +2711,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}") @@ -2721,23 +2720,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'), @@ -2816,7 +2815,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}") @@ -2824,14 +2823,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'), @@ -2917,7 +2916,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}") @@ -2926,14 +2925,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'), @@ -3012,7 +3011,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}") @@ -3020,14 +3019,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'), @@ -3113,7 +3112,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}") @@ -3122,14 +3121,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'), @@ -3219,7 +3218,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}") @@ -3228,10 +3227,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 = { @@ -3240,7 +3239,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'), @@ -3336,7 +3335,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}") @@ -3346,16 +3345,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", @@ -3363,7 +3362,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'), @@ -3455,7 +3454,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}") @@ -3464,10 +3463,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 = { @@ -3476,7 +3475,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'), @@ -3566,7 +3565,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}") @@ -3575,10 +3574,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 = { @@ -3587,7 +3586,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'), @@ -3677,7 +3676,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}") @@ -3686,10 +3685,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 = { @@ -3698,7 +3697,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 2f70fe7d02..7e12d2a6fd 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 cf60cc3a95..8cb1041763 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 @@ -172,7 +171,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}") @@ -181,10 +180,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 = { @@ -193,7 +192,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'), @@ -279,7 +278,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}") @@ -288,10 +287,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 = { @@ -300,7 +299,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'), @@ -389,7 +388,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}") @@ -399,10 +398,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 = { @@ -411,7 +410,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'), @@ -512,7 +511,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}") @@ -521,10 +520,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 = { @@ -534,7 +533,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'), @@ -624,7 +623,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}") @@ -635,7 +634,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'), @@ -716,7 +715,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}") @@ -725,10 +724,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 = { @@ -736,7 +735,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'), @@ -819,7 +818,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}") @@ -829,10 +828,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 = { @@ -840,7 +839,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'), @@ -941,7 +940,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}") @@ -950,10 +949,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: @@ -976,14 +975,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'), @@ -1101,7 +1100,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}") @@ -1137,14 +1136,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'), @@ -1241,7 +1240,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}") @@ -1250,10 +1249,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 = { @@ -1263,7 +1262,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'), @@ -1354,7 +1353,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}") @@ -1363,10 +1362,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 = { @@ -1375,7 +1374,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'), @@ -1468,7 +1467,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}") @@ -1478,10 +1477,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 = { @@ -1490,7 +1489,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'), @@ -1584,7 +1583,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}") @@ -1593,10 +1592,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 = { @@ -1605,7 +1604,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 b367321f3e..f5467c5225 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 @@ -171,7 +170,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}") @@ -180,10 +179,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 = { @@ -192,7 +191,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'), @@ -280,7 +279,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}") @@ -292,7 +291,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'), @@ -375,7 +374,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}") @@ -384,10 +383,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 = { @@ -396,7 +395,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'), @@ -470,7 +469,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}") @@ -479,10 +478,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 = { @@ -490,7 +489,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'), @@ -566,7 +565,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}") @@ -575,10 +574,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 = { @@ -586,7 +585,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'), @@ -696,7 +695,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}") @@ -732,14 +731,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'), @@ -835,7 +834,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}") @@ -844,10 +843,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: @@ -870,14 +869,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'), @@ -975,7 +974,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}") @@ -984,10 +983,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: @@ -1010,14 +1009,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'), @@ -1119,7 +1118,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}") @@ -1146,14 +1145,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'), @@ -1240,7 +1239,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}") @@ -1249,10 +1248,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 = { @@ -1261,7 +1260,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 f9018fe052..a169a55501 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 @@ -181,7 +180,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}") @@ -190,10 +189,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 = { @@ -203,7 +202,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'), @@ -289,7 +288,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}") @@ -300,7 +299,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'), @@ -383,7 +382,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}") @@ -392,10 +391,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 = { @@ -404,7 +403,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'), @@ -478,7 +477,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}") @@ -487,10 +486,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 = { @@ -498,7 +497,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'), @@ -576,7 +575,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}") @@ -585,10 +584,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 = { @@ -596,7 +595,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'), @@ -708,7 +707,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}") @@ -743,14 +742,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'), @@ -839,7 +838,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}") @@ -848,10 +847,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 = { @@ -859,14 +858,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'), @@ -957,7 +956,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}") @@ -966,10 +965,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 = { @@ -977,14 +976,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'), @@ -1076,7 +1075,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}") @@ -1087,14 +1086,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'), @@ -1191,7 +1190,7 @@ def reconfigure_private_endpoint_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"reconfigure_private_endpoint_vb_instance got unknown kwargs: {extra_kwargs!r}") @@ -1200,10 +1199,10 @@ def reconfigure_private_endpoint_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 = { @@ -1213,7 +1212,7 @@ def reconfigure_private_endpoint_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'), @@ -1308,7 +1307,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}") @@ -1317,10 +1316,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 = { @@ -1330,7 +1329,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'), @@ -1427,7 +1426,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}") @@ -1436,10 +1435,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 = { @@ -1449,7 +1448,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'), @@ -1542,7 +1541,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}") @@ -1551,10 +1550,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 = { @@ -1564,7 +1563,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'), @@ -1650,7 +1649,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}") @@ -1659,10 +1658,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 = { @@ -1671,7 +1670,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 244abc43ea..c31eb3f592 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 @@ -173,7 +172,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}") @@ -182,10 +181,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 = { @@ -194,7 +193,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'), @@ -279,7 +278,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}") @@ -290,7 +289,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'), @@ -376,7 +375,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}") @@ -385,10 +384,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 = { @@ -397,7 +396,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'), @@ -494,7 +493,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}") @@ -506,7 +505,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'), @@ -584,7 +583,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}") @@ -593,10 +592,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 = { @@ -604,7 +603,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'), @@ -683,7 +682,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}") @@ -692,10 +691,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 = { @@ -703,7 +702,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'), @@ -830,7 +829,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}") @@ -865,14 +864,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'), @@ -982,7 +981,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}") @@ -991,10 +990,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: @@ -1017,14 +1016,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'), @@ -1136,7 +1135,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}") @@ -1145,10 +1144,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: @@ -1171,14 +1170,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'), @@ -1284,7 +1283,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}") @@ -1293,10 +1292,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: @@ -1311,14 +1310,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'), @@ -1444,7 +1443,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}") @@ -1480,14 +1479,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'), @@ -1583,7 +1582,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}") @@ -1592,10 +1591,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 = { @@ -1605,7 +1604,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 00289aa5b8..d8e0af73b0 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 @@ -179,7 +178,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}") @@ -188,10 +187,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 = { @@ -201,7 +200,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'), @@ -297,7 +296,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}") @@ -306,10 +305,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 = { @@ -319,7 +318,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'), @@ -415,7 +414,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}") @@ -424,10 +423,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 = { @@ -437,7 +436,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'), @@ -533,7 +532,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}") @@ -542,10 +541,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 = { @@ -555,7 +554,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'), @@ -651,7 +650,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}") @@ -660,10 +659,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 = { @@ -673,7 +672,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'), @@ -769,7 +768,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}") @@ -778,10 +777,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 = { @@ -791,7 +790,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'), @@ -887,7 +886,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}") @@ -896,10 +895,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 = { @@ -909,7 +908,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'), @@ -1005,7 +1004,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}") @@ -1014,10 +1013,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 = { @@ -1027,7 +1026,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'), @@ -1123,7 +1122,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}") @@ -1132,10 +1131,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 = { @@ -1145,7 +1144,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'), @@ -1230,7 +1229,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}") @@ -1241,7 +1240,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'), @@ -1326,7 +1325,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}") @@ -1337,7 +1336,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'), @@ -1422,7 +1421,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}") @@ -1433,7 +1432,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'), @@ -1518,7 +1517,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}") @@ -1529,7 +1528,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'), @@ -1614,7 +1613,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}") @@ -1623,10 +1622,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 = { @@ -1635,7 +1634,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'), @@ -1717,7 +1716,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}") @@ -1726,10 +1725,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 = { @@ -1738,7 +1737,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'), @@ -1820,7 +1819,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}") @@ -1829,10 +1828,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 = { @@ -1841,7 +1840,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'), @@ -1923,7 +1922,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}") @@ -1932,10 +1931,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 = { @@ -1944,7 +1943,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'), @@ -2026,7 +2025,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}") @@ -2035,10 +2034,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 = { @@ -2047,7 +2046,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'), @@ -2129,7 +2128,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}") @@ -2138,10 +2137,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 = { @@ -2150,7 +2149,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'), @@ -2232,7 +2231,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}") @@ -2241,10 +2240,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 = { @@ -2253,7 +2252,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'), @@ -2335,7 +2334,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}") @@ -2344,10 +2343,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 = { @@ -2356,7 +2355,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'), @@ -2438,7 +2437,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}") @@ -2447,10 +2446,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 = { @@ -2459,7 +2458,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'), @@ -2533,7 +2532,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}") @@ -2543,7 +2542,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'), @@ -2619,7 +2618,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}") @@ -2629,7 +2628,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'), @@ -2705,7 +2704,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}") @@ -2714,10 +2713,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 = { @@ -2725,7 +2724,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'), @@ -2801,7 +2800,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}") @@ -2810,10 +2809,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 = { @@ -2821,7 +2820,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'), @@ -2897,7 +2896,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}") @@ -2906,10 +2905,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 = { @@ -2917,7 +2916,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'), @@ -2993,7 +2992,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}") @@ -3002,10 +3001,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 = { @@ -3013,7 +3012,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'), @@ -3089,7 +3088,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}") @@ -3098,10 +3097,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 = { @@ -3109,7 +3108,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'), @@ -3185,7 +3184,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}") @@ -3194,10 +3193,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 = { @@ -3205,7 +3204,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'), @@ -3281,7 +3280,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}") @@ -3290,10 +3289,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 = { @@ -3301,7 +3300,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'), @@ -3377,7 +3376,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}") @@ -3386,10 +3385,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 = { @@ -3397,7 +3396,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'), @@ -3473,7 +3472,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}") @@ -3482,10 +3481,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 = { @@ -3493,7 +3492,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'), @@ -3569,7 +3568,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}") @@ -3578,10 +3577,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 = { @@ -3589,7 +3588,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'), @@ -3665,7 +3664,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}") @@ -3674,10 +3673,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 = { @@ -3685,7 +3684,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'), @@ -3761,7 +3760,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}") @@ -3770,10 +3769,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 = { @@ -3781,7 +3780,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'), @@ -3887,7 +3886,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}") @@ -3922,14 +3921,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'), @@ -4059,7 +4058,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}") @@ -4099,14 +4098,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'), @@ -4212,7 +4211,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}") @@ -4247,14 +4246,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'), @@ -4384,7 +4383,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}") @@ -4424,14 +4423,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'), @@ -4557,7 +4556,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}") @@ -4596,14 +4595,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'), @@ -4729,7 +4728,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}") @@ -4768,14 +4767,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'), @@ -4901,7 +4900,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}") @@ -4940,14 +4939,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'), @@ -5053,7 +5052,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}") @@ -5088,14 +5087,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'), @@ -5200,7 +5199,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}") @@ -5209,10 +5208,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: @@ -5244,14 +5243,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'), @@ -5359,7 +5358,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}") @@ -5394,14 +5393,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'), @@ -5517,7 +5516,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}") @@ -5561,14 +5560,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'), @@ -5664,7 +5663,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}") @@ -5673,10 +5672,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: @@ -5699,14 +5698,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'), @@ -5824,7 +5823,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}") @@ -5868,14 +5867,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'), @@ -5971,7 +5970,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}") @@ -5980,10 +5979,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: @@ -6006,14 +6005,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'), @@ -6111,7 +6110,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}") @@ -6120,10 +6119,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: @@ -6146,14 +6145,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'), @@ -6239,7 +6238,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}") @@ -6248,24 +6247,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'), @@ -6351,7 +6350,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}") @@ -6360,24 +6359,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'), @@ -6463,7 +6462,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}") @@ -6473,14 +6472,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'), @@ -6567,7 +6566,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}") @@ -6576,10 +6575,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 = { @@ -6588,7 +6587,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'), @@ -6675,7 +6674,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}") @@ -6684,10 +6683,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 = { @@ -6696,7 +6695,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'), @@ -6783,7 +6782,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}") @@ -6792,10 +6791,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 = { @@ -6804,7 +6803,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'), @@ -6891,7 +6890,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}") @@ -6900,10 +6899,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 = { @@ -6912,7 +6911,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 761c128f63..9dc9928dd5 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 @@ -174,7 +173,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}") @@ -183,10 +182,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 = { @@ -195,7 +194,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'), @@ -283,7 +282,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}") @@ -292,10 +291,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 = { @@ -304,7 +303,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'), @@ -387,7 +386,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}") @@ -398,7 +397,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'), @@ -482,7 +481,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}") @@ -493,7 +492,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'), @@ -578,7 +577,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}") @@ -587,10 +586,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 = { @@ -599,7 +598,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'), @@ -681,7 +680,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}") @@ -690,10 +689,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 = { @@ -702,7 +701,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'), @@ -778,7 +777,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}") @@ -787,10 +786,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 = { @@ -798,7 +797,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'), @@ -876,7 +875,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}") @@ -885,10 +884,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 = { @@ -896,7 +895,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'), @@ -1012,7 +1011,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}") @@ -1041,14 +1040,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'), @@ -1171,7 +1170,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}") @@ -1201,14 +1200,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'), @@ -1290,7 +1289,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}") @@ -1299,10 +1298,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 = { @@ -1310,7 +1309,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'), @@ -1397,7 +1396,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}") @@ -1406,10 +1405,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 = { @@ -1418,7 +1417,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'), @@ -1505,7 +1504,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}") @@ -1514,10 +1513,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 = { @@ -1526,7 +1525,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 e529ed9da1..360c67d9a6 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 @@ -164,7 +163,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}") @@ -173,10 +172,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 = { @@ -184,7 +183,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'), @@ -271,7 +270,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}") @@ -280,24 +279,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'), @@ -386,7 +385,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}") @@ -395,24 +394,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'), @@ -507,7 +506,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}") @@ -518,14 +517,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 51822480a2..ae9ee24b51 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 @@ -173,7 +172,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}") @@ -182,10 +181,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 = { @@ -195,7 +194,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'), @@ -277,7 +276,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}") @@ -288,7 +287,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'), @@ -374,7 +373,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}") @@ -383,10 +382,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 = { @@ -396,7 +395,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'), @@ -473,7 +472,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}") @@ -482,10 +481,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 = { @@ -493,7 +492,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'), @@ -615,7 +614,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}") @@ -654,14 +653,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'), @@ -753,7 +752,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}") @@ -762,10 +761,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 = { @@ -775,7 +774,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 63542e60e5..32bc92e6ff 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 @@ -172,7 +171,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}") @@ -181,10 +180,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 = { @@ -193,7 +192,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'), @@ -280,7 +279,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}") @@ -289,10 +288,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 = { @@ -302,7 +301,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'), @@ -394,7 +393,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}") @@ -403,10 +402,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 = { @@ -416,7 +415,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'), @@ -509,7 +508,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}") @@ -518,10 +517,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 = { @@ -531,7 +530,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'), @@ -623,7 +622,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}") @@ -632,10 +631,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 = { @@ -645,7 +644,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'), @@ -738,7 +737,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}") @@ -747,10 +746,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 = { @@ -760,7 +759,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'), @@ -842,7 +841,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}") @@ -853,7 +852,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'), @@ -939,7 +938,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}") @@ -950,7 +949,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'), @@ -1037,7 +1036,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}") @@ -1048,7 +1047,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'), @@ -1145,7 +1144,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}") @@ -1156,7 +1155,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'), @@ -1242,7 +1241,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}") @@ -1251,10 +1250,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 = { @@ -1264,7 +1263,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'), @@ -1350,7 +1349,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}") @@ -1359,10 +1358,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 = { @@ -1372,7 +1371,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'), @@ -1458,7 +1457,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}") @@ -1467,10 +1466,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 = { @@ -1480,7 +1479,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'), @@ -1566,7 +1565,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}") @@ -1575,10 +1574,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 = { @@ -1588,7 +1587,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'), @@ -1665,7 +1664,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}") @@ -1674,10 +1673,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 = { @@ -1685,7 +1684,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'), @@ -1765,7 +1764,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}") @@ -1774,10 +1773,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 = { @@ -1785,7 +1784,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'), @@ -1865,7 +1864,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}") @@ -1874,10 +1873,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 = { @@ -1885,7 +1884,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'), @@ -1965,7 +1964,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}") @@ -1974,10 +1973,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 = { @@ -1985,7 +1984,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'), @@ -2065,7 +2064,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}") @@ -2074,10 +2073,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 = { @@ -2085,7 +2084,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'), @@ -2165,7 +2164,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}") @@ -2174,10 +2173,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 = { @@ -2185,7 +2184,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'), @@ -2265,7 +2264,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}") @@ -2274,10 +2273,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 = { @@ -2285,7 +2284,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'), @@ -2368,7 +2367,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}") @@ -2378,10 +2377,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 = { @@ -2389,7 +2388,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'), @@ -2469,7 +2468,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}") @@ -2478,10 +2477,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 = { @@ -2489,7 +2488,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'), @@ -2569,7 +2568,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}") @@ -2578,10 +2577,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 = { @@ -2589,7 +2588,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'), @@ -2669,7 +2668,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}") @@ -2678,10 +2677,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 = { @@ -2689,7 +2688,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'), @@ -2769,7 +2768,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}") @@ -2778,10 +2777,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 = { @@ -2789,7 +2788,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'), @@ -2869,7 +2868,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}") @@ -2878,10 +2877,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 = { @@ -2889,7 +2888,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'), @@ -2978,7 +2977,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}") @@ -2987,24 +2986,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'), @@ -3128,7 +3127,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}") @@ -3167,14 +3166,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'), @@ -3263,7 +3262,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}") @@ -3272,24 +3271,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'), @@ -3383,7 +3382,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}") @@ -3392,24 +3391,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'), @@ -3533,7 +3532,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}") @@ -3572,14 +3571,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'), @@ -3701,7 +3700,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}") @@ -3740,14 +3739,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'), @@ -3842,7 +3841,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}") @@ -3867,14 +3866,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'), @@ -3964,7 +3963,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}") @@ -3973,24 +3972,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'), @@ -4091,7 +4090,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}") @@ -4100,10 +4099,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: @@ -4120,14 +4119,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'), @@ -4228,7 +4227,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}") @@ -4237,10 +4236,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: @@ -4255,14 +4254,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'), @@ -4354,7 +4353,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}") @@ -4363,24 +4362,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'), @@ -4504,7 +4503,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}") @@ -4543,14 +4542,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'), @@ -4648,7 +4647,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}") @@ -4657,10 +4656,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: @@ -4677,14 +4676,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'), @@ -4788,7 +4787,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}") @@ -4797,10 +4796,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: @@ -4818,14 +4817,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'), @@ -5003,7 +5002,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}") @@ -5012,10 +5011,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: @@ -5065,14 +5064,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'), @@ -5172,7 +5171,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}") @@ -5181,10 +5180,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 = { @@ -5193,14 +5192,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'), @@ -5299,7 +5298,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}") @@ -5308,10 +5307,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 = { @@ -5320,14 +5319,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'), @@ -5417,7 +5416,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}") @@ -5426,24 +5425,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'), @@ -5550,7 +5549,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}") @@ -5577,14 +5576,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'), @@ -5674,7 +5673,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}") @@ -5683,10 +5682,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 = { @@ -5695,7 +5694,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'), @@ -5792,7 +5791,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}") @@ -5801,10 +5800,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 = { @@ -5814,7 +5813,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'), @@ -5901,7 +5900,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}") @@ -5910,10 +5909,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 = { @@ -5922,7 +5921,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'), @@ -6021,7 +6020,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}") @@ -6030,10 +6029,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 = { @@ -6043,7 +6042,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'), @@ -6142,7 +6141,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}") @@ -6151,10 +6150,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 = { @@ -6164,7 +6163,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'), @@ -6251,7 +6250,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}") @@ -6260,10 +6259,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 = { @@ -6272,7 +6271,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'), @@ -6364,7 +6363,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}") @@ -6373,10 +6372,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 = { @@ -6386,7 +6385,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'), @@ -6483,7 +6482,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}") @@ -6492,10 +6491,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 = { @@ -6505,7 +6504,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'), @@ -6599,7 +6598,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}") @@ -6608,10 +6607,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 = { @@ -6621,7 +6620,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'), @@ -6712,7 +6711,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}") @@ -6721,10 +6720,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 = { @@ -6734,7 +6733,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'), @@ -6827,7 +6826,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}") @@ -6836,10 +6835,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 = { @@ -6849,7 +6848,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'), @@ -6940,7 +6939,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}") @@ -6949,10 +6948,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 = { @@ -6962,7 +6961,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'), @@ -7051,7 +7050,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}") @@ -7060,10 +7059,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 = { @@ -7072,7 +7071,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'), @@ -7162,7 +7161,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}") @@ -7171,10 +7170,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 = { @@ -7184,7 +7183,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'), @@ -7270,7 +7269,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}") @@ -7279,10 +7278,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 = { @@ -7291,7 +7290,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'), @@ -7383,7 +7382,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}") @@ -7392,10 +7391,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 = { @@ -7405,7 +7404,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'), @@ -7497,7 +7496,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}") @@ -7506,10 +7505,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 = { @@ -7519,7 +7518,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'), @@ -7610,7 +7609,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}") @@ -7619,10 +7618,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 = { @@ -7632,7 +7631,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'), @@ -7730,7 +7729,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}") @@ -7739,10 +7738,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 = { @@ -7752,7 +7751,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'), @@ -7850,7 +7849,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}") @@ -7859,10 +7858,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 = { @@ -7872,7 +7871,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 03399ed1b3..5006765882 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 @@ -173,7 +172,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}") @@ -182,10 +181,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 = { @@ -194,7 +193,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'), @@ -284,7 +283,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}") @@ -293,10 +292,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 = { @@ -305,7 +304,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'), @@ -395,7 +394,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}") @@ -404,10 +403,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 = { @@ -416,7 +415,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'), @@ -501,7 +500,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}") @@ -512,7 +511,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'), @@ -598,7 +597,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}") @@ -609,7 +608,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'), @@ -695,7 +694,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}") @@ -706,7 +705,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'), @@ -793,7 +792,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}") @@ -802,10 +801,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 = { @@ -814,7 +813,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'), @@ -898,7 +897,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}") @@ -907,10 +906,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 = { @@ -919,7 +918,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'), @@ -1003,7 +1002,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}") @@ -1012,10 +1011,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 = { @@ -1024,7 +1023,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'), @@ -1102,7 +1101,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}") @@ -1111,10 +1110,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 = { @@ -1122,7 +1121,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'), @@ -1202,7 +1201,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}") @@ -1211,10 +1210,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 = { @@ -1222,7 +1221,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'), @@ -1302,7 +1301,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}") @@ -1311,10 +1310,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 = { @@ -1322,7 +1321,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'), @@ -1402,7 +1401,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}") @@ -1411,10 +1410,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 = { @@ -1422,7 +1421,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'), @@ -1540,7 +1539,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}") @@ -1569,14 +1568,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'), @@ -1703,7 +1702,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}") @@ -1741,14 +1740,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'), @@ -1861,7 +1860,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}") @@ -1896,14 +1895,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'), @@ -2021,7 +2020,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}") @@ -2050,14 +2049,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'), @@ -2181,7 +2180,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}") @@ -2211,14 +2210,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'), @@ -2307,7 +2306,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}") @@ -2316,24 +2315,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'), @@ -2424,7 +2423,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}") @@ -2433,24 +2432,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'), @@ -2547,7 +2546,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}") @@ -2558,14 +2557,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'), @@ -2654,7 +2653,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}") @@ -2663,10 +2662,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 = { @@ -2675,7 +2674,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'), @@ -2764,7 +2763,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}") @@ -2773,10 +2772,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 = { @@ -2785,7 +2784,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'), @@ -2874,7 +2873,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}") @@ -2883,10 +2882,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 = { @@ -2895,7 +2894,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/wlms/weblogic_management_service_client.py b/src/oci/wlms/weblogic_management_service_client.py index 22d0946200..961de32ea5 100644 --- a/src/oci/wlms/weblogic_management_service_client.py +++ b/src/oci/wlms/weblogic_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 @@ -183,7 +182,7 @@ def change_wls_domain_compartment(self, wls_domain_id, change_wls_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_wls_domain_compartment got unknown kwargs: {extra_kwargs!r}") @@ -192,10 +191,10 @@ def change_wls_domain_compartment(self, wls_domain_id, change_wls_domain_compart "wlsDomainId": wls_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 = { @@ -205,7 +204,7 @@ def change_wls_domain_compartment(self, wls_domain_id, change_wls_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'), @@ -305,7 +304,7 @@ def create_agreement_record(self, create_agreement_record_details, wls_domain_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"create_agreement_record got unknown kwargs: {extra_kwargs!r}") @@ -314,10 +313,10 @@ def create_agreement_record(self, create_agreement_record_details, wls_domain_id "wlsDomainId": wls_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 = { @@ -327,7 +326,7 @@ def create_agreement_record(self, create_agreement_record_details, wls_domain_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'), @@ -426,7 +425,7 @@ def delete_wls_domain(self, wls_domain_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_wls_domain got unknown kwargs: {extra_kwargs!r}") @@ -435,10 +434,10 @@ def delete_wls_domain(self, wls_domain_id, **kwargs): "wlsDomainId": wls_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 = { @@ -448,7 +447,7 @@ def delete_wls_domain(self, wls_domain_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'), @@ -522,7 +521,7 @@ def get_agreement(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_agreement got unknown kwargs: {extra_kwargs!r}") @@ -532,7 +531,7 @@ def get_agreement(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'), @@ -610,7 +609,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}") @@ -619,10 +618,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 = { @@ -630,7 +629,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'), @@ -717,7 +716,7 @@ def get_managed_instance_server(self, managed_instance_id, 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_managed_instance_server got unknown kwargs: {extra_kwargs!r}") @@ -727,10 +726,10 @@ def get_managed_instance_server(self, managed_instance_id, server_id, **kwargs): "serverId": 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 = { @@ -738,7 +737,7 @@ def get_managed_instance_server(self, managed_instance_id, 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'), @@ -818,7 +817,7 @@ def get_wls_domain(self, wls_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_wls_domain got unknown kwargs: {extra_kwargs!r}") @@ -827,10 +826,10 @@ def get_wls_domain(self, wls_domain_id, **kwargs): "wlsDomainId": wls_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 = { @@ -838,7 +837,7 @@ def get_wls_domain(self, wls_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'), @@ -923,7 +922,7 @@ def get_wls_domain_credential(self, wls_domain_id, credential_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_wls_domain_credential got unknown kwargs: {extra_kwargs!r}") @@ -933,10 +932,10 @@ def get_wls_domain_credential(self, wls_domain_id, credential_type, **kwargs): "credentialType": credential_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 = { @@ -944,7 +943,7 @@ def get_wls_domain_credential(self, wls_domain_id, credential_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'), @@ -1031,7 +1030,7 @@ def get_wls_domain_server(self, wls_domain_id, 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_wls_domain_server got unknown kwargs: {extra_kwargs!r}") @@ -1041,10 +1040,10 @@ def get_wls_domain_server(self, wls_domain_id, server_id, **kwargs): "serverId": 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 = { @@ -1052,7 +1051,7 @@ def get_wls_domain_server(self, wls_domain_id, 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'), @@ -1146,7 +1145,7 @@ def get_wls_domain_server_backup(self, wls_domain_id, server_id, backup_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_wls_domain_server_backup got unknown kwargs: {extra_kwargs!r}") @@ -1157,10 +1156,10 @@ def get_wls_domain_server_backup(self, wls_domain_id, server_id, backup_id, **kw "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 = { @@ -1168,7 +1167,7 @@ def get_wls_domain_server_backup(self, wls_domain_id, server_id, backup_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'), @@ -1262,7 +1261,7 @@ def get_wls_domain_server_backup_content(self, wls_domain_id, server_id, backup_ "retry_strategy", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"get_wls_domain_server_backup_content got unknown kwargs: {extra_kwargs!r}") @@ -1273,10 +1272,10 @@ def get_wls_domain_server_backup_content(self, wls_domain_id, server_id, backup_ "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 = { @@ -1284,7 +1283,7 @@ def get_wls_domain_server_backup_content(self, wls_domain_id, server_id, backup_ "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 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}") @@ -1373,10 +1372,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 = { @@ -1384,7 +1383,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'), @@ -1483,7 +1482,7 @@ def install_latest_patches_on_wls_domain(self, wls_domain_id, install_latest_pat "opc_request_id", "opc_retry_token" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key 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_latest_patches_on_wls_domain got unknown kwargs: {extra_kwargs!r}") @@ -1492,10 +1491,10 @@ def install_latest_patches_on_wls_domain(self, wls_domain_id, install_latest_pat "wlsDomainId": wls_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 = { @@ -1505,7 +1504,7 @@ def install_latest_patches_on_wls_domain(self, wls_domain_id, install_latest_pat "opc-request-id": kwargs.get("opc_request_id", missing), "opc-retry-token": kwargs.get("opc_retry_token", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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_agreement_records(self, wls_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_agreement_records got unknown kwargs: {extra_kwargs!r}") @@ -1618,10 +1617,10 @@ def list_agreement_records(self, wls_domain_id, **kwargs): "wlsDomainId": wls_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 'sort_order' in kwargs: @@ -1644,14 +1643,14 @@ def list_agreement_records(self, wls_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'), @@ -1763,7 +1762,7 @@ def list_applicable_patches(self, wls_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_applicable_patches got unknown kwargs: {extra_kwargs!r}") @@ -1772,10 +1771,10 @@ def list_applicable_patches(self, wls_domain_id, **kwargs): "wlsDomainId": wls_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 'sort_order' in kwargs: @@ -1798,7 +1797,7 @@ def list_applicable_patches(self, wls_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", @@ -1806,7 +1805,7 @@ def list_applicable_patches(self, wls_domain_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'), @@ -1922,7 +1921,7 @@ def list_managed_instance_scan_results(self, managed_instance_id, **kwargs): "wls_domain_id", "server_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_managed_instance_scan_results got unknown kwargs: {extra_kwargs!r}") @@ -1931,10 +1930,10 @@ def list_managed_instance_scan_results(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: @@ -1959,14 +1958,14 @@ def list_managed_instance_scan_results(self, managed_instance_id, **kwargs): "wlsDomainId": kwargs.get("wls_domain_id", missing), "serverName": kwargs.get("server_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'), @@ -2077,7 +2076,7 @@ def list_managed_instance_server_installed_patches(self, managed_instance_id, se "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_instance_server_installed_patches got unknown kwargs: {extra_kwargs!r}") @@ -2087,10 +2086,10 @@ def list_managed_instance_server_installed_patches(self, managed_instance_id, se "serverId": 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 'sort_order' in kwargs: @@ -2113,14 +2112,14 @@ def list_managed_instance_server_installed_patches(self, managed_instance_id, se "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v is not missing and v is not None} retry_strategy = self.base_client.get_preferred_retry_strategy( operation_retry_strategy=kwargs.get('retry_strategy'), @@ -2237,7 +2236,7 @@ def list_managed_instance_servers(self, managed_instance_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_managed_instance_servers got unknown kwargs: {extra_kwargs!r}") @@ -2246,10 +2245,10 @@ def list_managed_instance_servers(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: @@ -2273,7 +2272,7 @@ def list_managed_instance_servers(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", @@ -2281,7 +2280,7 @@ def list_managed_instance_servers(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'), @@ -2411,7 +2410,7 @@ def list_managed_instances(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_managed_instances got unknown kwargs: {extra_kwargs!r}") @@ -2447,7 +2446,7 @@ 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", @@ -2455,7 +2454,7 @@ def list_managed_instances(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'), @@ -2531,7 +2530,7 @@ def list_required_policies(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_required_policies got unknown kwargs: {extra_kwargs!r}") @@ -2541,7 +2540,7 @@ def list_required_policies(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'), @@ -2627,7 +2626,7 @@ def list_wls_domain_credentials(self, wls_domain_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"list_wls_domain_credentials got unknown kwargs: {extra_kwargs!r}") @@ -2636,10 +2635,10 @@ def list_wls_domain_credentials(self, wls_domain_id, **kwargs): "wlsDomainId": wls_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 = { @@ -2648,7 +2647,7 @@ def list_wls_domain_credentials(self, wls_domain_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'), @@ -2756,7 +2755,7 @@ def list_wls_domain_scan_results(self, wls_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_wls_domain_scan_results got unknown kwargs: {extra_kwargs!r}") @@ -2765,10 +2764,10 @@ def list_wls_domain_scan_results(self, wls_domain_id, **kwargs): "wlsDomainId": wls_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 'sort_order' in kwargs: @@ -2792,14 +2791,14 @@ def list_wls_domain_scan_results(self, wls_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'), @@ -2910,7 +2909,7 @@ def list_wls_domain_server_backups(self, wls_domain_id, server_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_wls_domain_server_backups got unknown kwargs: {extra_kwargs!r}") @@ -2920,10 +2919,10 @@ def list_wls_domain_server_backups(self, wls_domain_id, server_id, **kwargs): "serverId": 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 'sort_order' in kwargs: @@ -2946,14 +2945,14 @@ def list_wls_domain_server_backups(self, wls_domain_id, server_id, **kwargs): "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing) } - query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + query_params = {k: v for (k, v) in query_params.items() if v is not missing and v is not None} header_params = { "accept": "application/json", "content-type": "application/json", "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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 list_wls_domain_server_installed_patches(self, wls_domain_id, server_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_wls_domain_server_installed_patches got unknown kwargs: {extra_kwargs!r}") @@ -3074,10 +3073,10 @@ def list_wls_domain_server_installed_patches(self, wls_domain_id, server_id, **k "serverId": 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 'sort_order' in kwargs: @@ -3100,14 +3099,14 @@ def list_wls_domain_server_installed_patches(self, wls_domain_id, server_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'), @@ -3224,7 +3223,7 @@ def list_wls_domain_servers(self, wls_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_wls_domain_servers got unknown kwargs: {extra_kwargs!r}") @@ -3233,10 +3232,10 @@ def list_wls_domain_servers(self, wls_domain_id, **kwargs): "wlsDomainId": wls_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 'sort_order' in kwargs: @@ -3260,7 +3259,7 @@ def list_wls_domain_servers(self, wls_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", @@ -3268,7 +3267,7 @@ def list_wls_domain_servers(self, wls_domain_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'), @@ -3417,7 +3416,7 @@ def list_wls_domains(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_wls_domains got unknown kwargs: {extra_kwargs!r}") @@ -3477,7 +3476,7 @@ def list_wls_domains(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", @@ -3485,7 +3484,7 @@ def list_wls_domains(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'), @@ -3589,7 +3588,7 @@ def list_wls_domains_sharing_middlewares(self, wls_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_wls_domains_sharing_middlewares got unknown kwargs: {extra_kwargs!r}") @@ -3598,10 +3597,10 @@ def list_wls_domains_sharing_middlewares(self, wls_domain_id, **kwargs): "wlsDomainId": wls_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 'sort_order' in kwargs: @@ -3624,14 +3623,14 @@ def list_wls_domains_sharing_middlewares(self, wls_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'), @@ -3733,7 +3732,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}") @@ -3742,10 +3741,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: @@ -3768,14 +3767,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'), @@ -3877,7 +3876,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}") @@ -3886,10 +3885,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: @@ -3912,14 +3911,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'), @@ -4039,7 +4038,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}") @@ -4075,14 +4074,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'), @@ -4181,7 +4180,7 @@ def restart_wls_domain(self, wls_domain_id, restart_wls_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"restart_wls_domain got unknown kwargs: {extra_kwargs!r}") @@ -4190,10 +4189,10 @@ def restart_wls_domain(self, wls_domain_id, restart_wls_domain_details, **kwargs "wlsDomainId": wls_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 = { @@ -4203,7 +4202,7 @@ def restart_wls_domain(self, wls_domain_id, restart_wls_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'), @@ -4303,7 +4302,7 @@ def restore_wls_domain(self, wls_domain_id, restore_wls_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"restore_wls_domain got unknown kwargs: {extra_kwargs!r}") @@ -4312,10 +4311,10 @@ def restore_wls_domain(self, wls_domain_id, restore_wls_domain_details, **kwargs "wlsDomainId": wls_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 = { @@ -4325,7 +4324,7 @@ def restore_wls_domain(self, wls_domain_id, restore_wls_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'), @@ -4422,7 +4421,7 @@ def scan_managed_instance(self, managed_instance_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"scan_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -4431,10 +4430,10 @@ def scan_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 = { @@ -4444,7 +4443,7 @@ def scan_managed_instance(self, managed_instance_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'), @@ -4539,7 +4538,7 @@ def scan_wls_domain(self, wls_domain_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"scan_wls_domain got unknown kwargs: {extra_kwargs!r}") @@ -4548,10 +4547,10 @@ def scan_wls_domain(self, wls_domain_id, **kwargs): "wlsDomainId": wls_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 = { @@ -4561,7 +4560,7 @@ def scan_wls_domain(self, wls_domain_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'), @@ -4659,7 +4658,7 @@ def set_restart_order(self, wls_domain_id, set_restart_order_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_restart_order got unknown kwargs: {extra_kwargs!r}") @@ -4668,10 +4667,10 @@ def set_restart_order(self, wls_domain_id, set_restart_order_details, **kwargs): "wlsDomainId": wls_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 = { @@ -4681,7 +4680,7 @@ def set_restart_order(self, wls_domain_id, set_restart_order_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'), @@ -4780,7 +4779,7 @@ def start_wls_domain(self, wls_domain_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_wls_domain got unknown kwargs: {extra_kwargs!r}") @@ -4789,10 +4788,10 @@ def start_wls_domain(self, wls_domain_id, **kwargs): "wlsDomainId": wls_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 = { @@ -4802,7 +4801,7 @@ def start_wls_domain(self, wls_domain_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'), @@ -4900,7 +4899,7 @@ def stop_wls_domain(self, wls_domain_id, stop_wls_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"stop_wls_domain got unknown kwargs: {extra_kwargs!r}") @@ -4909,10 +4908,10 @@ def stop_wls_domain(self, wls_domain_id, stop_wls_domain_details, **kwargs): "wlsDomainId": wls_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 = { @@ -4922,7 +4921,7 @@ def stop_wls_domain(self, wls_domain_id, stop_wls_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'), @@ -5002,7 +5001,7 @@ def summarize_resource_inventory(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"summarize_resource_inventory got unknown kwargs: {extra_kwargs!r}") @@ -5010,14 +5009,14 @@ def summarize_resource_inventory(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'), @@ -5116,7 +5115,7 @@ def update_managed_instance(self, managed_instance_id, update_managed_instance_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"update_managed_instance got unknown kwargs: {extra_kwargs!r}") @@ -5125,10 +5124,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 = { @@ -5138,7 +5137,7 @@ def update_managed_instance(self, managed_instance_id, update_managed_instance_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'), @@ -5232,7 +5231,7 @@ def update_wls_domain(self, wls_domain_id, update_wls_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_wls_domain got unknown kwargs: {extra_kwargs!r}") @@ -5241,10 +5240,10 @@ def update_wls_domain(self, wls_domain_id, update_wls_domain_details, **kwargs): "wlsDomainId": wls_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 = { @@ -5253,7 +5252,7 @@ def update_wls_domain(self, wls_domain_id, update_wls_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'), @@ -5351,7 +5350,7 @@ def update_wls_domain_credential(self, wls_domain_id, credential_type, update_wl "if_match", "opc_request_id" ] - extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + extra_kwargs = [_key for _key in kwargs.keys() if _key not in expected_kwargs] if extra_kwargs: raise ValueError( f"update_wls_domain_credential got unknown kwargs: {extra_kwargs!r}") @@ -5361,10 +5360,10 @@ def update_wls_domain_credential(self, wls_domain_id, credential_type, update_wl "credentialType": credential_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 = { @@ -5373,7 +5372,7 @@ def update_wls_domain_credential(self, wls_domain_id, credential_type, update_wl "if-match": kwargs.get("if_match", missing), "opc-request-id": kwargs.get("opc_request_id", missing) } - header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + header_params = {k: v for (k, v) in header_params.items() if v 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/wlms/weblogic_management_service_configuration_client.py b/src/oci/wlms/weblogic_management_service_configuration_client.py index 1be02f81a0..df36a0296b 100644 --- a/src/oci/wlms/weblogic_management_service_configuration_client.py +++ b/src/oci/wlms/weblogic_management_service_configuration_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 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}") @@ -171,14 +170,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'), @@ -276,7 +275,7 @@ def update_configuration(self, compartment_id, update_configuration_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_configuration got unknown kwargs: {extra_kwargs!r}") @@ -284,7 +283,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", @@ -293,7 +292,7 @@ def update_configuration(self, compartment_id, update_configuration_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'), diff --git a/src/oci/work_requests/work_request_client.py b/src/oci/work_requests/work_request_client.py index 980fc143e7..4980dc75a3 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 @@ -168,7 +167,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}") @@ -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 = { @@ -188,7 +187,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'), @@ -289,7 +288,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}") @@ -298,10 +297,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: @@ -316,14 +315,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'), @@ -426,7 +425,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}") @@ -435,10 +434,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: @@ -453,14 +452,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'), @@ -563,7 +562,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}") @@ -574,14 +573,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/zpr/zpr_client.py b/src/oci/zpr/zpr_client.py index 122d0028d3..f27c40012c 100644 --- a/src/oci/zpr/zpr_client.py +++ b/src/oci/zpr/zpr_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 create_configuration(self, create_configuration_details, **kwargs): "opc_retry_token", "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_configuration got unknown kwargs: {extra_kwargs!r}") @@ -189,7 +188,7 @@ def create_configuration(self, create_configuration_details, **kwargs): "opc-retry-token": kwargs.get("opc_retry_token", 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'), @@ -282,7 +281,7 @@ def create_zpr_policy(self, create_zpr_policy_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_zpr_policy got unknown kwargs: {extra_kwargs!r}") @@ -294,7 +293,7 @@ def create_zpr_policy(self, create_zpr_policy_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'), @@ -390,7 +389,7 @@ def delete_zpr_policy(self, zpr_policy_id, **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"delete_zpr_policy got unknown kwargs: {extra_kwargs!r}") @@ -399,10 +398,10 @@ def delete_zpr_policy(self, zpr_policy_id, **kwargs): "zprPolicyId": zpr_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 = { @@ -412,7 +411,7 @@ def delete_zpr_policy(self, zpr_policy_id, **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'), @@ -495,7 +494,7 @@ def get_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_configuration got unknown kwargs: {extra_kwargs!r}") @@ -503,14 +502,14 @@ def get_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'), @@ -593,7 +592,7 @@ def get_zpr_configuration_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_zpr_configuration_work_request got unknown kwargs: {extra_kwargs!r}") @@ -602,10 +601,10 @@ def get_zpr_configuration_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 = { @@ -613,7 +612,7 @@ def get_zpr_configuration_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'), @@ -696,7 +695,7 @@ def get_zpr_policy(self, zpr_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_zpr_policy got unknown kwargs: {extra_kwargs!r}") @@ -705,10 +704,10 @@ def get_zpr_policy(self, zpr_policy_id, **kwargs): "zprPolicyId": zpr_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 = { @@ -716,7 +715,7 @@ def get_zpr_policy(self, zpr_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'), @@ -799,7 +798,7 @@ def get_zpr_policy_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_zpr_policy_work_request got unknown kwargs: {extra_kwargs!r}") @@ -808,10 +807,10 @@ def get_zpr_policy_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 = { @@ -819,7 +818,7 @@ def get_zpr_policy_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'), @@ -930,7 +929,7 @@ def list_zpr_configuration_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_zpr_configuration_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -939,10 +938,10 @@ def list_zpr_configuration_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: @@ -965,14 +964,14 @@ def list_zpr_configuration_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'), @@ -1085,7 +1084,7 @@ def list_zpr_configuration_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_zpr_configuration_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -1094,10 +1093,10 @@ def list_zpr_configuration_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: @@ -1120,14 +1119,14 @@ def list_zpr_configuration_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'), @@ -1259,7 +1258,7 @@ def list_zpr_configuration_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_zpr_configuration_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1295,14 +1294,14 @@ def list_zpr_configuration_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'), @@ -1432,7 +1431,7 @@ def list_zpr_policies(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_zpr_policies got unknown kwargs: {extra_kwargs!r}") @@ -1468,14 +1467,14 @@ def list_zpr_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'), @@ -1586,7 +1585,7 @@ def list_zpr_policy_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_zpr_policy_work_request_errors got unknown kwargs: {extra_kwargs!r}") @@ -1595,10 +1594,10 @@ def list_zpr_policy_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: @@ -1621,14 +1620,14 @@ def list_zpr_policy_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'), @@ -1741,7 +1740,7 @@ def list_zpr_policy_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_zpr_policy_work_request_logs got unknown kwargs: {extra_kwargs!r}") @@ -1750,10 +1749,10 @@ def list_zpr_policy_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: @@ -1776,14 +1775,14 @@ def list_zpr_policy_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'), @@ -1915,7 +1914,7 @@ def list_zpr_policy_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_zpr_policy_work_requests got unknown kwargs: {extra_kwargs!r}") @@ -1951,14 +1950,14 @@ def list_zpr_policy_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'), @@ -2064,7 +2063,7 @@ def update_zpr_policy(self, zpr_policy_id, update_zpr_policy_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"update_zpr_policy got unknown kwargs: {extra_kwargs!r}") @@ -2073,10 +2072,10 @@ def update_zpr_policy(self, zpr_policy_id, update_zpr_policy_details, **kwargs): "zprPolicyId": zpr_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 = { @@ -2087,7 +2086,7 @@ def update_zpr_policy(self, zpr_policy_id, update_zpr_policy_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'), diff --git a/tests/util.py b/tests/util.py index cd7db1df34..9cd91c6c74 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: @@ -194,7 +193,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): @@ -204,7 +203,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: