diff --git a/mopidy/audio/playlists.py b/mopidy/audio/playlists.py index e091d8ff..a7ec7791 100644 --- a/mopidy/audio/playlists.py +++ b/mopidy/audio/playlists.py @@ -1,6 +1,5 @@ from __future__ import absolute_import, unicode_literals -import ConfigParser as configparser import io import gobject @@ -9,6 +8,8 @@ import pygst pygst.require('0.10') import gst # noqa +from mopidy.utils.compat import configparser + try: import xml.etree.cElementTree as elementtree except ImportError: diff --git a/mopidy/config/__init__.py b/mopidy/config/__init__.py index 82c30b96..e41269c9 100644 --- a/mopidy/config/__init__.py +++ b/mopidy/config/__init__.py @@ -1,6 +1,5 @@ from __future__ import absolute_import, unicode_literals -import ConfigParser as configparser import io import itertools import logging @@ -11,6 +10,7 @@ from mopidy.config import keyring from mopidy.config.schemas import * # noqa from mopidy.config.types import * # noqa from mopidy.utils import compat, path, versioning +from mopidy.utils.compat import configparser logger = logging.getLogger(__name__) diff --git a/mopidy/utils/path.py b/mopidy/utils/path.py index de03247c..9e5df36a 100644 --- a/mopidy/utils/path.py +++ b/mopidy/utils/path.py @@ -1,6 +1,5 @@ from __future__ import absolute_import, unicode_literals -import Queue as queue import logging import os import stat @@ -12,6 +11,7 @@ import urlparse import glib from mopidy.utils import compat +from mopidy.utils.compat import queue logger = logging.getLogger(__name__) diff --git a/mopidy/utils/process.py b/mopidy/utils/process.py index c86deb12..02c60ef8 100644 --- a/mopidy/utils/process.py +++ b/mopidy/utils/process.py @@ -2,15 +2,14 @@ from __future__ import absolute_import, unicode_literals import logging import signal -try: - import _thread as thread # Python 3 -except ImportError: - import thread # Python 2 import threading from pykka import ActorDeadError from pykka.registry import ActorRegistry +from mopidy.utils.compat import thread + + logger = logging.getLogger(__name__)