From 66be2dc551371f45da4561cdd8bfac15895bfbc8 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Thu, 11 Apr 2013 23:30:29 +0200 Subject: [PATCH] config: Rename mopidy.config.values to types --- mopidy/config/__init__.py | 2 +- mopidy/config/schemas.py | 6 +- mopidy/config/{values.py => types.py} | 0 .../config/{values_test.py => types_test.py} | 94 +++++++++---------- 4 files changed, 51 insertions(+), 51 deletions(-) rename mopidy/config/{values.py => types.py} (100%) rename tests/config/{values_test.py => types_test.py} (83%) diff --git a/mopidy/config/__init__.py b/mopidy/config/__init__.py index 5ac492d4..715027cc 100644 --- a/mopidy/config/__init__.py +++ b/mopidy/config/__init__.py @@ -7,7 +7,7 @@ import logging import sys from mopidy.config.schemas import * -from mopidy.config.values import * +from mopidy.config.types import * from mopidy.utils import path logger = logging.getLogger('mopdiy.config') diff --git a/mopidy/config/schemas.py b/mopidy/config/schemas.py index 5c90c474..13928054 100644 --- a/mopidy/config/schemas.py +++ b/mopidy/config/schemas.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals from mopidy import exceptions -from mopidy.config import values +from mopidy.config import types def _did_you_mean(name, choices): @@ -101,7 +101,7 @@ class ExtensionConfigSchema(ConfigSchema): """ def __init__(self): super(ExtensionConfigSchema, self).__init__() - self['enabled'] = values.Boolean() + self['enabled'] = types.Boolean() class LogLevelConfigSchema(object): @@ -112,7 +112,7 @@ class LogLevelConfigSchema(object): :class:`ConfigSchema`, but implements the same interface. """ def __init__(self): - self._config_value = values.LogLevel() + self._config_value = types.LogLevel() def format(self, name, values): lines = ['[%s]' % name] diff --git a/mopidy/config/values.py b/mopidy/config/types.py similarity index 100% rename from mopidy/config/values.py rename to mopidy/config/types.py diff --git a/tests/config/values_test.py b/tests/config/types_test.py similarity index 83% rename from tests/config/values_test.py rename to tests/config/types_test.py index 442fffbb..89fb3ac1 100644 --- a/tests/config/values_test.py +++ b/tests/config/types_test.py @@ -5,14 +5,14 @@ import mock import socket from mopidy import exceptions -from mopidy.config import values +from mopidy.config import types from tests import unittest class ConfigValueTest(unittest.TestCase): def test_init(self): - value = values.ConfigValue() + value = types.ConfigValue() self.assertIsNone(value.choices) self.assertIsNone(value.maximum) self.assertIsNone(value.minimum) @@ -22,7 +22,7 @@ class ConfigValueTest(unittest.TestCase): def test_init_with_params(self): kwargs = {'choices': ['foo'], 'minimum': 0, 'maximum': 10, 'secret': True, 'optional': True} - value = values.ConfigValue(**kwargs) + value = types.ConfigValue(**kwargs) self.assertEqual(['foo'], value.choices) self.assertEqual(0, value.minimum) self.assertEqual(10, value.maximum) @@ -30,90 +30,90 @@ class ConfigValueTest(unittest.TestCase): self.assertEqual(True, value.secret) def test_deserialize_passes_through(self): - value = values.ConfigValue() + value = types.ConfigValue() obj = object() self.assertEqual(obj, value.deserialize(obj)) def test_serialize_conversion_to_string(self): - value = values.ConfigValue() + value = types.ConfigValue() self.assertIsInstance(value.serialize(object()), basestring) def test_format_uses_serialize(self): - value = values.ConfigValue() + value = types.ConfigValue() obj = object() self.assertEqual(value.serialize(obj), value.format(obj)) def test_format_masks_secrets(self): - value = values.ConfigValue(secret=True) + value = types.ConfigValue(secret=True) self.assertEqual('********', value.format(object())) class StringTest(unittest.TestCase): def test_deserialize_conversion_success(self): - value = values.String() + value = types.String() self.assertEqual('foo', value.deserialize(' foo ')) def test_deserialize_enforces_choices(self): - value = values.String(choices=['foo', 'bar', 'baz']) + value = types.String(choices=['foo', 'bar', 'baz']) self.assertEqual('foo', value.deserialize('foo')) self.assertRaises(ValueError, value.deserialize, 'foobar') def test_deserialize_enforces_required(self): - value = values.String() + value = types.String() self.assertRaises(ValueError, value.deserialize, '') self.assertRaises(ValueError, value.deserialize, ' ') def test_deserialize_respects_optional(self): - value = values.String(optional=True) + value = types.String(optional=True) self.assertIsNone(value.deserialize('')) self.assertIsNone(value.deserialize(' ')) def test_serialize_string_escapes(self): - value = values.String() + value = types.String() self.assertEqual(r'\r\n\t', value.serialize('\r\n\t')) def test_format_masks_secrets(self): - value = values.String(secret=True) + value = types.String(secret=True) self.assertEqual('********', value.format('s3cret')) class IntegerTest(unittest.TestCase): def test_deserialize_conversion_success(self): - value = values.Integer() + value = types.Integer() self.assertEqual(123, value.deserialize('123')) self.assertEqual(0, value.deserialize('0')) self.assertEqual(-10, value.deserialize('-10')) def test_deserialize_conversion_failure(self): - value = values.Integer() + value = types.Integer() self.assertRaises(ValueError, value.deserialize, 'asd') self.assertRaises(ValueError, value.deserialize, '3.14') self.assertRaises(ValueError, value.deserialize, '') self.assertRaises(ValueError, value.deserialize, ' ') def test_deserialize_enforces_choices(self): - value = values.Integer(choices=[1, 2, 3]) + value = types.Integer(choices=[1, 2, 3]) self.assertEqual(3, value.deserialize('3')) self.assertRaises(ValueError, value.deserialize, '5') def test_deserialize_enforces_minimum(self): - value = values.Integer(minimum=10) + value = types.Integer(minimum=10) self.assertEqual(15, value.deserialize('15')) self.assertRaises(ValueError, value.deserialize, '5') def test_deserialize_enforces_maximum(self): - value = values.Integer(maximum=10) + value = types.Integer(maximum=10) self.assertEqual(5, value.deserialize('5')) self.assertRaises(ValueError, value.deserialize, '15') def test_format_masks_secrets(self): - value = values.Integer(secret=True) + value = types.Integer(secret=True) self.assertEqual('********', value.format('1337')) class BooleanTest(unittest.TestCase): def test_deserialize_conversion_success(self): - value = values.Boolean() + value = types.Boolean() for true in ('1', 'yes', 'true', 'on'): self.assertIs(value.deserialize(true), True) self.assertIs(value.deserialize(true.upper()), True) @@ -124,24 +124,24 @@ class BooleanTest(unittest.TestCase): self.assertIs(value.deserialize(false.capitalize()), False) def test_deserialize_conversion_failure(self): - value = values.Boolean() + value = types.Boolean() self.assertRaises(ValueError, value.deserialize, 'nope') self.assertRaises(ValueError, value.deserialize, 'sure') self.assertRaises(ValueError, value.deserialize, '') def test_serialize(self): - value = values.Boolean() + value = types.Boolean() self.assertEqual('true', value.serialize(True)) self.assertEqual('false', value.serialize(False)) def test_format_masks_secrets(self): - value = values.Boolean(secret=True) + value = types.Boolean(secret=True) self.assertEqual('********', value.format('true')) class ListTest(unittest.TestCase): def test_deserialize_conversion_success(self): - value = values.List() + value = types.List() expected = ('foo', 'bar', 'baz') self.assertEqual(expected, value.deserialize('foo, bar ,baz ')) @@ -150,17 +150,17 @@ class ListTest(unittest.TestCase): self.assertEqual(expected, value.deserialize(' foo,bar\nbar\nbaz')) def test_deserialize_enforces_required(self): - value = values.List() + value = types.List() self.assertRaises(ValueError, value.deserialize, '') self.assertRaises(ValueError, value.deserialize, ' ') def test_deserialize_respects_optional(self): - value = values.List(optional=True) + value = types.List(optional=True) self.assertEqual(tuple(), value.deserialize('')) self.assertEqual(tuple(), value.deserialize(' ')) def test_serialize(self): - value = values.List() + value = types.List() result = value.serialize(('foo', 'bar', 'baz')) self.assertRegexpMatches(result, r'foo\n\s*bar\n\s*baz') @@ -173,21 +173,21 @@ class BooleanTest(unittest.TestCase): 'debug': logging.DEBUG} def test_deserialize_conversion_success(self): - value = values.LogLevel() + value = types.LogLevel() for name, level in self.levels.items(): self.assertEqual(level, value.deserialize(name)) self.assertEqual(level, value.deserialize(name.upper())) self.assertEqual(level, value.deserialize(name.capitalize())) def test_deserialize_conversion_failure(self): - value = values.LogLevel() + value = types.LogLevel() self.assertRaises(ValueError, value.deserialize, 'nope') self.assertRaises(ValueError, value.deserialize, 'sure') self.assertRaises(ValueError, value.deserialize, '') self.assertRaises(ValueError, value.deserialize, ' ') def test_serialize(self): - value = values.LogLevel() + value = types.LogLevel() for name, level in self.levels.items(): self.assertEqual(name, value.serialize(level)) self.assertIsNone(value.serialize(1337)) @@ -196,26 +196,26 @@ class BooleanTest(unittest.TestCase): class HostnameTest(unittest.TestCase): @mock.patch('socket.getaddrinfo') def test_deserialize_conversion_success(self, getaddrinfo_mock): - value = values.Hostname() + value = types.Hostname() value.deserialize('example.com') getaddrinfo_mock.assert_called_once_with('example.com', None) @mock.patch('socket.getaddrinfo') def test_deserialize_conversion_failure(self, getaddrinfo_mock): - value = values.Hostname() + value = types.Hostname() getaddrinfo_mock.side_effect = socket.error self.assertRaises(ValueError, value.deserialize, 'example.com') @mock.patch('socket.getaddrinfo') def test_deserialize_enforces_required(self, getaddrinfo_mock): - value = values.Hostname() + value = types.Hostname() self.assertRaises(ValueError, value.deserialize, '') self.assertRaises(ValueError, value.deserialize, ' ') self.assertEqual(0, getaddrinfo_mock.call_count) @mock.patch('socket.getaddrinfo') def test_deserialize_respects_optional(self, getaddrinfo_mock): - value = values.Hostname(optional=True) + value = types.Hostname(optional=True) self.assertIsNone(value.deserialize('')) self.assertIsNone(value.deserialize(' ')) self.assertEqual(0, getaddrinfo_mock.call_count) @@ -223,14 +223,14 @@ class HostnameTest(unittest.TestCase): class PortTest(unittest.TestCase): def test_valid_ports(self): - value = values.Port() + value = types.Port() self.assertEqual(1, value.deserialize('1')) self.assertEqual(80, value.deserialize('80')) self.assertEqual(6600, value.deserialize('6600')) self.assertEqual(65535, value.deserialize('65535')) def test_invalid_ports(self): - value = values.Port() + value = types.Port() self.assertRaises(ValueError, value.deserialize, '65536') self.assertRaises(ValueError, value.deserialize, '100000') self.assertRaises(ValueError, value.deserialize, '0') @@ -240,48 +240,48 @@ class PortTest(unittest.TestCase): class ExpandedPathTest(unittest.TestCase): def test_is_bytes(self): - self.assertIsInstance(values.ExpandedPath('/tmp'), bytes) + self.assertIsInstance(types.ExpandedPath('/tmp'), bytes) @mock.patch('mopidy.utils.path.expand_path') def test_defaults_to_expanded(self, expand_path_mock): expand_path_mock.return_value = 'expanded_path' - self.assertEqual('expanded_path', values.ExpandedPath('~')) + self.assertEqual('expanded_path', types.ExpandedPath('~')) @mock.patch('mopidy.utils.path.expand_path') def test_orginal_stores_unexpanded(self, expand_path_mock): - self.assertEqual('~', values.ExpandedPath('~').original) + self.assertEqual('~', types.ExpandedPath('~').original) class PathTest(unittest.TestCase): def test_deserialize_conversion_success(self): - result = values.Path().deserialize('/foo') + result = types.Path().deserialize('/foo') self.assertEqual('/foo', result) - self.assertIsInstance(result, values.ExpandedPath) + self.assertIsInstance(result, types.ExpandedPath) self.assertIsInstance(result, bytes) def test_deserialize_enforces_choices(self): - value = values.Path(choices=['/foo', '/bar', '/baz']) + value = types.Path(choices=['/foo', '/bar', '/baz']) self.assertEqual('/foo', value.deserialize('/foo')) self.assertRaises(ValueError, value.deserialize, '/foobar') def test_deserialize_enforces_required(self): - value = values.Path() + value = types.Path() self.assertRaises(ValueError, value.deserialize, '') self.assertRaises(ValueError, value.deserialize, ' ') def test_deserialize_respects_optional(self): - value = values.Path(optional=True) + value = types.Path(optional=True) self.assertIsNone(value.deserialize('')) self.assertIsNone(value.deserialize(' ')) @mock.patch('mopidy.utils.path.expand_path') def test_serialize_uses_original(self, expand_path_mock): expand_path_mock.return_value = 'expanded_path' - path = values.ExpandedPath('original_path') - value = values.Path() + path = types.ExpandedPath('original_path') + value = types.Path() self.assertEqual('expanded_path', path) self.assertEqual('original_path', value.serialize(path)) def test_serialize_plain_string(self): - value = values.Path() + value = types.Path() self.assertEqual('path', value.serialize('path'))