From 4f428b86019d0ba2d013405248c0a6fa0cd45c80 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sun, 7 Dec 2014 21:36:15 +0100 Subject: [PATCH] py3: Move compat module out of utils --- mopidy/audio/playlists.py | 2 +- mopidy/audio/utils.py | 2 +- mopidy/{utils => }/compat.py | 0 mopidy/config/__init__.py | 5 +++-- mopidy/config/keyring.py | 2 +- mopidy/config/types.py | 3 ++- mopidy/core/tracklist.py | 2 +- mopidy/local/commands.py | 4 ++-- mopidy/local/translator.py | 2 +- mopidy/utils/encoding.py | 2 +- mopidy/utils/jsonrpc.py | 2 +- mopidy/utils/path.py | 4 ++-- mopidy/utils/process.py | 2 +- tests/__init__.py | 2 +- tests/config/test_types.py | 2 +- tests/utils/network/test_lineprotocol.py | 3 ++- tests/utils/test_path.py | 3 ++- 17 files changed, 23 insertions(+), 19 deletions(-) rename mopidy/{utils => }/compat.py (100%) diff --git a/mopidy/audio/playlists.py b/mopidy/audio/playlists.py index a7ec7791..5688db4b 100644 --- a/mopidy/audio/playlists.py +++ b/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 diff --git a/mopidy/audio/utils.py b/mopidy/audio/utils.py index cb60af89..a94e4551 100644 --- a/mopidy/audio/utils.py +++ b/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): diff --git a/mopidy/utils/compat.py b/mopidy/compat.py similarity index 100% rename from mopidy/utils/compat.py rename to mopidy/compat.py diff --git a/mopidy/config/__init__.py b/mopidy/config/__init__.py index e41269c9..6edca51c 100644 --- a/mopidy/config/__init__.py +++ b/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.compat import configparser +from mopidy.utils import path, versioning logger = logging.getLogger(__name__) diff --git a/mopidy/config/keyring.py b/mopidy/config/keyring.py index 75fa8dcf..fb6eded3 100644 --- a/mopidy/config/keyring.py +++ b/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 diff --git a/mopidy/config/types.py b/mopidy/config/types.py index 1dbbe39f..cd3905ac 100644 --- a/mopidy/config/types.py +++ b/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): diff --git a/mopidy/core/tracklist.py b/mopidy/core/tracklist.py index 65c04e05..4b378a02 100644 --- a/mopidy/core/tracklist.py +++ b/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__) diff --git a/mopidy/local/commands.py b/mopidy/local/commands.py index 5dacca32..0110a6dd 100644 --- a/mopidy/local/commands.py +++ b/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__) diff --git a/mopidy/local/translator.py b/mopidy/local/translator.py index ca8b5e94..7d7f0601 100644 --- a/mopidy/local/translator.py +++ b/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 diff --git a/mopidy/utils/encoding.py b/mopidy/utils/encoding.py index be8d5a7f..27506816 100644 --- a/mopidy/utils/encoding.py +++ b/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): diff --git a/mopidy/utils/jsonrpc.py b/mopidy/utils/jsonrpc.py index 7990586b..13199b26 100644 --- a/mopidy/utils/jsonrpc.py +++ b/mopidy/utils/jsonrpc.py @@ -6,7 +6,7 @@ import traceback import pykka -from mopidy.utils import compat +from mopidy import compat class JsonRpcWrapper(object): diff --git a/mopidy/utils/path.py b/mopidy/utils/path.py index 9e5df36a..54f480b4 100644 --- a/mopidy/utils/path.py +++ b/mopidy/utils/path.py @@ -10,8 +10,8 @@ import urlparse import glib -from mopidy.utils import compat -from mopidy.utils.compat import queue +from mopidy import compat +from mopidy.compat import queue logger = logging.getLogger(__name__) diff --git a/mopidy/utils/process.py b/mopidy/utils/process.py index 02c60ef8..5b2bb9c0 100644 --- a/mopidy/utils/process.py +++ b/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__) diff --git a/tests/__init__.py b/tests/__init__.py index c664a5fa..82759578 100644 --- a/tests/__init__.py +++ b/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): diff --git a/tests/config/test_types.py b/tests/config/test_types.py index f113fb28..939d028b 100644 --- a/tests/config/test_types.py +++ b/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 diff --git a/tests/utils/network/test_lineprotocol.py b/tests/utils/network/test_lineprotocol.py index 5c6a5ad4..28bfbad2 100644 --- a/tests/utils/network/test_lineprotocol.py +++ b/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 diff --git a/tests/utils/test_path.py b/tests/utils/test_path.py index b15fd1b5..d82bcbe6 100644 --- a/tests/utils/test_path.py +++ b/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