andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use deps.{platform_info,python_info} in log

Browse Source
This commit is contained in:
Stein Magnus Jodal 2012-10-16 22:26:28 +02:00
parent 5fc77be76e
commit afdc665ac0
3 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mopidy/__init__.py
View File

@ -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)

8
mopidy/utils/log.py
View File

@ -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():

12
tests/version_test.py
View File

@ -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())