Revert #2426 which introduced bad imports

obspy/clients/fdsn/client.py

@@ -23,6 +23,7 @@
 import textwrap
 import threading
 import warnings
+from collections import OrderedDict
 
 from lxml import etree
 
@@ -39,13 +40,10 @@
     from urllib import urlencode
     import urllib2 as urllib_request
     import Queue as queue  # NOQA
-    from collections import OrderedDict
-
 else:
     from urllib.parse import urlencode
     import urllib.request as urllib_request
     import queue
-    from collections.abc import OrderedDict
 
 
 DEFAULT_SERVICE_VERSIONS = {'dataselect': 1, 'station': 1, 'event': 1}

obspy/clients/fdsn/wadl_parser.py

@@ -15,15 +15,10 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 from future.builtins import *  # NOQA
-from future.utils import PY2
 
 import io
 import warnings
-
-if PY2:
-    from collections import defaultdict
-else:
-    from collections.abc import defaultdict
+from collections import defaultdict
 
 from lxml import etree
 

obspy/core/inventory/response.py

@@ -12,14 +12,10 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 from future.builtins import *  # NOQA
-from future.utils import PY2
 
 import copy
 import ctypes as C  # NOQA
-if PY2:
-    from collections import defaultdict
-else:
-    from collections.abc import defaultdict
+from collections import defaultdict
 from copy import deepcopy
 import itertools
 from math import pi

obspy/core/util/base.py

@@ -23,10 +23,7 @@
 import sys
 import tempfile
 import unicodedata
-if PY2:
-    from collections import OrderedDict
-else:
-    from collections.abc import OrderedDict
+from collections import OrderedDict
 
 import numpy as np
 import pkg_resources

obspy/core/util/obspy_types.py

@@ -11,12 +11,8 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 from future.builtins import *  # NOQA
-from future.utils import PY2
 
-if PY2:
-    from collections import OrderedDict
-else:
-    from collections.abc import OrderedDict
+from collections import OrderedDict
 
 try:
     import __builtin__

obspy/io/mseed/scripts/recordanalyzer.py

@@ -21,16 +21,12 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 from future.builtins import *  # NOQA
-from future.utils import PY2, native_str
-
+from future.utils import native_str
 
 import sys
 import string
 from argparse import ArgumentParser
-if PY2:
-    from collections import OrderedDict
-else:
-    from collections.abc import OrderedDict
+from collections import OrderedDict
 from copy import deepcopy
 from struct import unpack
 

obspy/io/nordic/utils.py

@@ -11,13 +11,9 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 from future.builtins import *  # NOQA @UnusedWildImport
-from future.utils import PY2
 
 import warnings
-if PY2:
-    from collections import defaultdict
-else:
-    from collections.abc import defaultdict
+from collections import defaultdict
 
 from obspy.io.nordic import NordicParsingError
 

obspy/io/rg16/core.py

@@ -4,12 +4,8 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 from future.builtins import *  # NOQA
-from future.utils import PY2
 
-if PY2:
-    from collections import namedtuple
-else:
-    from collections.abc import namedtuple
+from collections import namedtuple
 
 import numpy as np
 

obspy/io/sh/evt.py

@@ -12,12 +12,8 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 from future.builtins import *  # NOQA
-from future.utils import PY2
 
-if PY2:
-    from collections import defaultdict
-else:
-    from collections.abc import defaultdict
+from collections import defaultdict
 import io
 from math import cos, pi
 from warnings import warn

obspy/signal/trigger.py

@@ -28,12 +28,8 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 from future.builtins import *  # NOQA
-from future.utils import PY2
 
-if PY2:
-    from collections import deque
-else:
-    from collections.abc import deque
+from collections import deque
 import ctypes as C  # NOQA
 import warnings
 

obspy/taup/helper_classes.py

@@ -7,12 +7,8 @@
                         unicode_literals)
 from future.builtins import *  # NOQA
 from future.utils import native_str
-from future.utils import PY2
 
-if PY2:
-    from collections import namedtuple
-else:
-    from collections.abc import namedtuple
+from collections import namedtuple
 
 import numpy as np
 

obspy/taup/tau_model.py

@@ -6,12 +6,9 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 from future.builtins import *  # NOQA
-from future.utils import PY2, native_str
+from future.utils import native_str
 
-if PY2:
-    from collections import OrderedDict
-else:
-    from collections.abc import OrderedDict
+from collections import OrderedDict
 import os
 from copy import deepcopy
 from itertools import count

obspy/taup/tests/test_tau.py

@@ -6,17 +6,14 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 from future.builtins import *  # NOQA
-from future.utils import PY2, native_str
+from future.utils import native_str
 
 import collections
 import inspect
 import os
 import unittest
 import warnings
-if PY2:
-    from collections import OrderedDict
-else:
-    from collections.abc import OrderedDict
+from collections import OrderedDict
 
 import numpy as np