From afdc665ac089a53c803324fadf5802568a1d1dcb Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 16 Oct 2012 22:26:28 +0200 Subject: [PATCH] Use deps.{platform_info,python_info} in log --- mopidy/__init__.py | 12 ------------ mopidy/utils/log.py | 8 ++++---- tests/version_test.py | 12 +----------- 3 files changed, 5 insertions(+), 27 deletions(-) diff --git a/mopidy/__init__.py b/mopidy/__init__.py index 83607be6..76aca226 100644 --- a/mopidy/__init__.py +++ b/mopidy/__init__.py @@ -1,5 +1,4 @@ import os -import platform import sys if not (2, 6) <= sys.version_info < (3,): @@ -14,17 +13,6 @@ CACHE_PATH = os.path.join(str(glib.get_user_cache_dir()), 'mopidy') SETTINGS_PATH = os.path.join(str(glib.get_user_config_dir()), 'mopidy') SETTINGS_FILE = os.path.join(SETTINGS_PATH, 'settings.py') - -def get_platform(): - return platform.platform() - - -def get_python(): - implementation = platform.python_implementation() - version = platform.python_version() - return u' '.join([implementation, version]) - - from mopidy import settings as default_settings_module from mopidy.utils.settings import SettingsProxy settings = SettingsProxy(default_settings_module) diff --git a/mopidy/utils/log.py b/mopidy/utils/log.py index 93f17c92..3421746d 100644 --- a/mopidy/utils/log.py +++ b/mopidy/utils/log.py @@ -1,8 +1,8 @@ import logging import logging.handlers -from mopidy import get_platform, get_python, settings -from . import versioning +from mopidy import settings +from . import deps, versioning def setup_logging(verbosity_level, save_debug_log): @@ -12,8 +12,8 @@ def setup_logging(verbosity_level, save_debug_log): setup_debug_logging_to_file() logger = logging.getLogger('mopidy.utils.log') logger.info(u'Starting Mopidy %s', versioning.get_version()) - logger.info(u'Platform: %s', get_platform()) - logger.info(u'Python: %s', get_python()) + logger.info(u'%(name)s: %(version)s', deps.platform_info()) + logger.info(u'%(name)s: %(version)s', deps.python_info()) def setup_root_logger(): diff --git a/tests/version_test.py b/tests/version_test.py index 678dc221..004abab7 100644 --- a/tests/version_test.py +++ b/tests/version_test.py @@ -1,7 +1,6 @@ from distutils.version import StrictVersion as SV -import platform -from mopidy import __version__, get_platform, get_python +from mopidy import __version__ from tests import unittest @@ -30,12 +29,3 @@ class VersionTest(unittest.TestCase): self.assertLess(SV('0.7.2'), SV('0.7.3')) self.assertLess(SV('0.7.3'), SV(__version__)) self.assertLess(SV(__version__), SV('0.8.1')) - - def test_get_platform_contains_platform(self): - self.assertIn(platform.platform(), get_platform()) - - def test_get_python_contains_python_implementation(self): - self.assertIn(platform.python_implementation(), get_python()) - - def test_get_python_contains_python_version(self): - self.assertIn(platform.python_version(), get_python())