diff --git a/mopidy/frontends/mpd/session.py b/mopidy/frontends/mpd/session.py index a9eba73e..72a1f845 100644 --- a/mopidy/frontends/mpd/session.py +++ b/mopidy/frontends/mpd/session.py @@ -3,7 +3,7 @@ import logging import multiprocessing from mopidy.frontends.mpd.protocol import ENCODING, LINE_TERMINATOR, VERSION -from mopidy.utils import indent +from mopidy.utils.log import indent from mopidy.utils.process import pickle_connection logger = logging.getLogger('mopidy.frontends.mpd.session') diff --git a/mopidy/utils/__init__.py b/mopidy/utils/__init__.py index 277d2f3b..acbb4664 100644 --- a/mopidy/utils/__init__.py +++ b/mopidy/utils/__init__.py @@ -27,12 +27,3 @@ def get_class(name): except (ImportError, AttributeError): raise ImportError("Couldn't load: %s" % name) return class_object - -def indent(string, places=4, linebreak='\n'): - lines = string.split(linebreak) - if len(lines) == 1: - return string - result = u'' - for line in lines: - result += linebreak + ' ' * places + line - return result diff --git a/mopidy/utils/log.py b/mopidy/utils/log.py index e75a6df6..c892102a 100644 --- a/mopidy/utils/log.py +++ b/mopidy/utils/log.py @@ -26,3 +26,11 @@ def setup_dump_logging(): handler.setFormatter(formatter) root.addHandler(handler) +def indent(string, places=4, linebreak='\n'): + lines = string.split(linebreak) + if len(lines) == 1: + return string + result = u'' + for line in lines: + result += linebreak + ' ' * places + line + return result diff --git a/mopidy/utils/settings.py b/mopidy/utils/settings.py index f1d213de..e45c5521 100644 --- a/mopidy/utils/settings.py +++ b/mopidy/utils/settings.py @@ -6,7 +6,7 @@ import os import sys from mopidy import SettingsError -from mopidy.utils import indent +from mopidy.utils.log import indent logger = logging.getLogger('mopidy.utils.settings')