Import Iterator/Iterable from collections.abc

odo/backends/aws.py

@@ -6,7 +6,7 @@
 import re
 from fnmatch import fnmatch
 from contextlib import contextmanager
-from collections import Iterator
+from collections.abc import Iterator
 from operator import attrgetter
 from io import BytesIO
 

odo/backends/dask.py

@@ -1,5 +1,5 @@
 from __future__ import absolute_import, division, print_function
-from collections import Iterator
+from collections.abc import Iterator
 
 import numpy as np
 import pandas as pd

odo/backends/hdfs.py

@@ -14,7 +14,8 @@
 import sqlalchemy as sa
 from datashape import discover
 from datashape import coretypes as ct
-from collections import namedtuple, Iterator
+from collections import namedtuple
+from collections.abc import Iterator
 from contextlib import contextmanager
 from .ssh import SSH
 from .sql import metadata_of_engine

odo/backends/json.py

@@ -2,7 +2,7 @@
 
 import json
 from toolz.curried import map, take, pipe, pluck, get, concat, filter
-from collections import Iterator, Iterable
+from collections.abc import Iterator, Iterable
 import os
 from contextlib import contextmanager
 

odo/backends/mongo.py

@@ -2,7 +2,7 @@
 
 import pymongo
 from pymongo.collection import Collection
-from collections import Iterator
+from collections.abc import Iterator
 from datashape import discover, DataShape, Record, var
 from datashape.predicates import isdimension
 from datashape.dispatch import dispatch

odo/backends/sas.py

@@ -5,7 +5,7 @@
 
 import datashape
 from datashape import discover, dshape, var, Record, date_, datetime_
-from collections import Iterator
+from collections.abc import Iterator
 import pandas as pd
 from .pandas import coerce_datetimes
 from ..append import append

odo/backends/sparksql.py

@@ -7,7 +7,7 @@
 import shutil
 
 from functools import partial
-from collections import Iterator
+from collections.abc import Iterator
 from datetime import datetime, date
 
 import pandas as pd

odo/backends/sql.py

@@ -11,7 +11,7 @@
 
 from operator import attrgetter
 from itertools import chain
-from collections import Iterator
+from collections.abc import Iterator
 from datetime import datetime, date, timedelta
 from distutils.spawn import find_executable
 

odo/backends/tests/test_csv.py

@@ -10,7 +10,7 @@
 import gzip
 import datashape
 from datashape import Option, string
-from collections import Iterator
+from collections.abc import Iterator
 
 from odo.backends.csv import (CSV, append, convert, resource,
                               csv_to_dataframe, CSV_to_chunks_of_dataframes,

odo/backends/tests/test_sas.py

@@ -5,7 +5,7 @@
 pytest.importorskip('odo.backends.sas')
 import os
 import pandas as pd
-from collections import Iterator
+from collections.abc import Iterator
 from sas7bdat import SAS7BDAT
 
 from odo.backends.sas import discover, sas_to_iterator

odo/backends/text.py

@@ -2,7 +2,7 @@
 
 import gzip
 from datashape import discover, dshape
-from collections import Iterator
+from collections.abc import Iterator
 from toolz import partial, concat
 import uuid
 import os

odo/chunks.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import, division, print_function
 
-from collections import Iterator
+from collections.abc import Iterator
 
 from toolz import memoize, first, peek
 from datashape import discover, var

odo/convert.py

@@ -4,7 +4,7 @@
 import pandas as pd
 from datashape.predicates import isscalar
 from toolz import concat, partition_all, compose
-from collections import Iterator, Iterable
+from collections.abc import Iterator, Iterable
 import datashape
 from datashape import discover
 from .core import NetworkDispatcher, ooc_types

odo/core.py

@@ -1,6 +1,7 @@
 from __future__ import absolute_import, division, print_function
 
-from collections import namedtuple, Iterator
+from collections import namedtuple
+from collections.abc import Iterator
 from contextlib import contextmanager
 from warnings import warn
 

odo/tests/test_convert.py

@@ -7,7 +7,7 @@
                          iterator_to_DataFrame_chunks)
 from odo.chunks import chunks
 from datashape import discover, dshape
-from collections import Iterator
+from collections.abc import Iterator
 import datetime
 import datashape
 import numpy as np