openstack/os-vif
Code Issues Proposed changes

Merge "Drop use of deprecated collections classes"

Browse Source
This commit is contained in:
Zuul 2021-02-16 13:45:19 +00:00 committed by Gerrit Code Review
commit 6167658e5b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vif_plug_ovs/ovsdb/impl_vsctl.py
View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import collections import collections.abc
import itertools import itertools
import uuid import uuid
@ -32,7 +32,7 @@ LOG = logging.getLogger(__name__)
def _val_to_py(val): def _val_to_py(val):
"""Convert a json ovsdb return value to native python object""" """Convert a json ovsdb return value to native python object"""
if isinstance(val, collections.Sequence) and len(val) == 2: if isinstance(val, collections.abc.Sequence) and len(val) == 2:
if val[0] == "uuid": if val[0] == "uuid":
return uuid.UUID(val[1]) return uuid.UUID(val[1])
elif val[0] == "set": elif val[0] == "set":
@ -282,7 +282,7 @@ class OvsdbVsctl(ovsdb_api.API, api.ImplAPI):
def db_add(self, table, record, column, *values): def db_add(self, table, record, column, *values):
args = [table, record, column] args = [table, record, column]
for value in values: for value in values:
if isinstance(value, collections.Mapping): if isinstance(value, collections.abc.Mapping):
args += ["{}={}".format(_py_to_val(k), _py_to_val(v)) args += ["{}={}".format(_py_to_val(k), _py_to_val(v))
for k, v in value.items()] for k, v in value.items()]
else: else:
@ -374,10 +374,10 @@ def _set_colval_args(*col_values):
col, op, val = entry[0], '=', entry[1] col, op, val = entry[0], '=', entry[1]
else: else:
col, op, val = entry col, op, val = entry
if isinstance(val, collections.Mapping): if isinstance(val, collections.abc.Mapping):
args += ["%s:%s%s%s" % ( args += ["%s:%s%s%s" % (
col, k, op, _py_to_val(v)) for k, v in val.items()] col, k, op, _py_to_val(v)) for k, v in val.items()]
elif (isinstance(val, collections.Sequence) and elif (isinstance(val, collections.abc.Sequence) and
not isinstance(val, str)): not isinstance(val, str)):
if len(val) == 0: if len(val) == 0:
args.append("%s%s%s" % (col, op, "[]")) args.append("%s%s%s" % (col, op, "[]"))