Skip to content

Commit a067368

Browse files
authored
More Python 3.10 fixes (#282)
Fixes #280
1 parent fb06cab commit a067368

1 file changed

Lines changed: 4 additions & 9 deletions

File tree

maas/client/flesh/tabular.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
from abc import ABCMeta, abstractmethod
66
import collections
7+
from collections.abc import Iterable
78
import csv
89
import enum
910
from io import StringIO
@@ -297,9 +298,7 @@ def render(self, target, datum):
297298
elif target is RenderTarget.json:
298299
return datum
299300
elif target is RenderTarget.csv:
300-
if isinstance(datum, collections.Iterable) and not isinstance(
301-
datum, (str, bytes)
302-
):
301+
if isinstance(datum, Iterable) and not isinstance(datum, (str, bytes)):
303302
return ",".join(datum)
304303
else:
305304
return datum
@@ -308,9 +307,7 @@ def render(self, target, datum):
308307
return ""
309308
elif isinstance(datum, colorclass.Color):
310309
return datum.value_no_colors
311-
elif isinstance(datum, collections.Iterable) and not isinstance(
312-
datum, (str, bytes)
313-
):
310+
elif isinstance(datum, Iterable) and not isinstance(datum, (str, bytes)):
314311
return "\n".join(datum)
315312
else:
316313
return str(datum)
@@ -319,9 +316,7 @@ def render(self, target, datum):
319316
return ""
320317
elif isinstance(datum, colorclass.Color):
321318
return datum
322-
elif isinstance(datum, collections.Iterable) and not isinstance(
323-
datum, (str, bytes)
324-
):
319+
elif isinstance(datum, Iterable) and not isinstance(datum, (str, bytes)):
325320
return "\n".join(datum)
326321
else:
327322
return str(datum)

0 commit comments

Comments
 (0)