py3: Move compat module out of utils

mopidy/audio/playlists.py

@@ -8,7 +8,7 @@ import pygst
 pygst.require('0.10')
 import gst  # noqa
 
-from mopidy.utils.compat import configparser
+from mopidy.compat import configparser
 
 try:
     import xml.etree.cElementTree as elementtree

mopidy/audio/utils.py

@@ -4,7 +4,7 @@ import pygst
 pygst.require('0.10')
 import gst  # noqa
 
-from mopidy.utils import compat
+from mopidy import compat
 
 
 def calculate_duration(num_samples, sample_rate):

mopidy/config/__init__.py

@@ -6,11 +6,12 @@ import logging
 import os.path
 import re
 
+from mopidy import compat
+from mopidy.compat import configparser
 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 import path, versioning
-from mopidy.utils.compat import configparser
 
 logger = logging.getLogger(__name__)
 

mopidy/config/keyring.py

@@ -9,7 +9,7 @@ try:
 except ImportError:
     dbus = None
 
-from mopidy.utils import compat
+from mopidy import compat
 
 
 # XXX: Hack to workaround introspection bug caused by gnome-keyring, should be

mopidy/config/types.py

@@ -4,8 +4,9 @@ import logging
 import re
 import socket
 
+from mopidy import compat
 from mopidy.config import validators
-from mopidy.utils import compat, path
+from mopidy.utils import path
 
 
 def decode(value):

mopidy/core/tracklist.py

@@ -4,9 +4,9 @@ import collections
 import logging
 import random
 
+from mopidy import compat
 from mopidy.core import listener
 from mopidy.models import TlTrack
-from mopidy.utils import compat
 
 
 logger = logging.getLogger(__name__)

mopidy/local/commands.py

@@ -5,10 +5,10 @@ import logging
 import os
 import time
 
-from mopidy import commands, exceptions
+from mopidy import commands, compat, exceptions
 from mopidy.audio import scan
 from mopidy.local import translator
-from mopidy.utils import compat, path
+from mopidy.utils import path
 
 
 logger = logging.getLogger(__name__)

mopidy/local/translator.py

@@ -6,8 +6,8 @@ import re
 import urllib
 import urlparse
 
+from mopidy import compat
 from mopidy.models import Track
-from mopidy.utils import compat
 from mopidy.utils.encoding import locale_decode
 from mopidy.utils.path import path_to_uri, uri_to_path
 

mopidy/utils/encoding.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 import locale
 
-from mopidy.utils import compat
+from mopidy import compat
 
 
 def locale_decode(bytestr):

mopidy/utils/jsonrpc.py

@@ -6,7 +6,7 @@ import traceback
 
 import pykka
 
-from mopidy.utils import compat
+from mopidy import compat
 
 
 class JsonRpcWrapper(object):

mopidy/utils/path.py

@@ -10,8 +10,8 @@ import urlparse
 
 import glib
 
-from mopidy.utils import compat
+from mopidy import compat
-from mopidy.utils.compat import queue
+from mopidy.compat import queue
 
 
 logger = logging.getLogger(__name__)

mopidy/utils/process.py

@@ -7,7 +7,7 @@ import threading
 from pykka import ActorDeadError
 from pykka.registry import ActorRegistry
 
-from mopidy.utils.compat import thread
+from mopidy.compat import thread
 
 
 logger = logging.getLogger(__name__)

tests/__init__.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
 
 import os
 
-from mopidy.utils import compat
+from mopidy import compat
 
 
 def path_to_data_dir(name):

tests/config/test_types.py

@@ -8,8 +8,8 @@ import unittest
 
 import mock
 
+from mopidy import compat
 from mopidy.config import types
-from mopidy.utils import compat
 
 # TODO: DecodeTest and EncodeTest
 

tests/utils/network/test_lineprotocol.py

@@ -7,7 +7,8 @@ import unittest
 
 from mock import Mock, sentinel
 
-from mopidy.utils import compat, network
+from mopidy import compat
+from mopidy.utils import network
 
 from tests import any_unicode
 

tests/utils/test_path.py

@@ -9,7 +9,8 @@ import unittest
 
 import glib
 
-from mopidy.utils import compat, path
+from mopidy import compat
+from mopidy.utils import path
 
 import tests