From 5a79b65d47abad90e80d6eb37a3e581d98f727e9 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Fri, 5 Apr 2013 23:31:31 +0200 Subject: [PATCH] settings: Remove did you mean. --- mopidy/utils/settings.py | 36 ------------------------------------ tests/utils/settings_test.py | 3 +-- 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/mopidy/utils/settings.py b/mopidy/utils/settings.py index 5916ee24..f903a70d 100644 --- a/mopidy/utils/settings.py +++ b/mopidy/utils/settings.py @@ -169,41 +169,5 @@ def validate_settings(defaults, settings): elif setting not in defaults and not setting.startswith('CUSTOM_'): errors[setting] = 'Unknown setting.' - suggestion = did_you_mean(setting, defaults) - - if suggestion: - errors[setting] += ' Did you mean %s?' % suggestion return errors - - -def did_you_mean(setting, defaults): - """Suggest most likely setting based on levenshtein.""" - if not defaults: - return None - - setting = setting.upper() - candidates = [(levenshtein(setting, d), d) for d in defaults] - candidates.sort() - - if candidates[0][0] <= 3: - return candidates[0][1] - return None - - -def levenshtein(a, b): - """Calculates the Levenshtein distance between a and b.""" - n, m = len(a), len(b) - if n > m: - return levenshtein(b, a) - - current = xrange(n + 1) - for i in xrange(1, m + 1): - previous, current = current, [i] + [0] * n - for j in xrange(1, n + 1): - add, delete = previous[j] + 1, current[j - 1] + 1 - change = previous[j - 1] - if a[j - 1] != b[i - 1]: - change += 1 - current[j] = min(add, delete, change) - return current[n] diff --git a/tests/utils/settings_test.py b/tests/utils/settings_test.py index 3aa595e3..ce763486 100644 --- a/tests/utils/settings_test.py +++ b/tests/utils/settings_test.py @@ -24,8 +24,7 @@ class ValidateSettingsTest(unittest.TestCase): result = setting_utils.validate_settings( self.defaults, {'MPD_SERVER_HOSTNMAE': '127.0.0.1'}) self.assertEqual( - result['MPD_SERVER_HOSTNMAE'], - 'Unknown setting. Did you mean MPD_SERVER_HOSTNAME?') + result['MPD_SERVER_HOSTNMAE'], 'Unknown setting.') def test_custom_settings_does_not_return_errors(self): result = setting_utils.validate_settings(