From f2614469c5ef9137ca1891d7393396409d275b06 Mon Sep 17 00:00:00 2001
From: Darko Poljak <foss@ungleich.com>
Date: Mon, 11 Sep 2017 22:36:45 +0200
Subject: [PATCH] configuration: converter() -> get_converter()

---
 cdist/configuration.py               | 22 +++++++++++-----------
 cdist/test/configuration/__init__.py | 14 +++++++-------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/cdist/configuration.py b/cdist/configuration.py
index 4a8274d8..8600cb0c 100644
--- a/cdist/configuration.py
+++ b/cdist/configuration.py
@@ -53,7 +53,7 @@ class OptionBase:
     def __init__(self, name):
         self.name = name
 
-    def converter(self, *args, **kwargs):
+    def get_converter(self, *args, **kwargs):
         raise NotImplementedError('Subclass should implement this method')
 
     def translate(self, val):
@@ -83,7 +83,7 @@ class StringOption(OptionBase):
     def __init__(self, name):
         super().__init__(name)
 
-    def converter(self):
+    def get_converter(self):
         def string_converter(val):
             return self.translate(str(val))
         return string_converter
@@ -101,7 +101,7 @@ class BooleanOption(OptionBase):
     def __init__(self, name):
         super().__init__(name)
 
-    def converter(self):
+    def get_converter(self):
         def boolean_converter(val):
             v = val.lower()
             if v not in self.BOOLEAN_STATES:
@@ -118,7 +118,7 @@ class IntOption(OptionBase):
     def __init__(self, name):
         super().__init__(name)
 
-    def converter(self):
+    def get_converter(self):
         def int_converter(val):
             return self.translate(int(val))
         return int_converter
@@ -129,9 +129,9 @@ class LowerBoundIntOption(IntOption):
         super().__init__(name)
         self.lower_bound = lower_bound
 
-    def converter(self):
+    def get_converter(self):
         def lower_bound_converter(val):
-            converted = super(LowerBoundIntOption, self).converter()(val)
+            converted = super(LowerBoundIntOption, self).get_converter()(val)
             if converted < self.lower_bound:
                 raise ValueError("Invalid {} value: {} < {}".format(
                     self.name, val, self.lower_bound))
@@ -161,7 +161,7 @@ class SelectOption(OptionBase):
         super().__init__(name)
         self.valid_values = valid_values
 
-    def converter(self):
+    def get_converter(self):
         def select_converter(val):
             if val in self.valid_values:
                 return self.translate(val)
@@ -186,7 +186,7 @@ class DelimitedValuesOption(OptionBase):
         super().__init__(name)
         self.delimiter = delimiter
 
-    def converter(self):
+    def get_converter(self):
         def delimited_values_converter(val):
             vals = re.split(r'(?<!\\)' + self.delimiter, val)
             vals = [x for x in vals if x]
@@ -220,7 +220,7 @@ class LogLevelOption(OptionBase):
     def __init__(self):
         super().__init__('__cdist_log_level')
 
-    def converter(self):
+    def get_converter(self):
         def log_level_converter(val):
             try:
                 val = logging.getLevelName(int(val))
@@ -374,7 +374,7 @@ class Configuration(metaclass=Singleton):
                     raise ValueError("Invalid option: {}.".format(option))
 
                 option_object = self.CONFIG_FILE_OPTIONS[section][option]
-                converter = option_object.converter()
+                converter = option_object.get_converter()
                 val = config_parser[section][option]
                 newval = converter(val)
                 d[section][option] = newval
@@ -392,7 +392,7 @@ class Configuration(metaclass=Singleton):
                         opt = self.ENV_VAR_OPTIONS[option]
                     else:
                         opt = self.CONFIG_FILE_OPTIONS[section][dst_opt]
-                    converter = opt.converter()
+                    converter = opt.get_converter()
                     val = env[option]
                     newval = converter(val)
                     d[dst_opt] = newval
diff --git a/cdist/test/configuration/__init__.py b/cdist/test/configuration/__init__.py
index c6135317..b44fd17c 100644
--- a/cdist/test/configuration/__init__.py
+++ b/cdist/test/configuration/__init__.py
@@ -72,7 +72,7 @@ class ConfigurationOptionsTestCase(test.CdistTestCase):
         option = cc.StringOption('test')
         self.assertIsNone(option.translate(''))
         self.assertEqual(option.translate('spam'), 'spam')
-        converter = option.converter()
+        converter = option.get_converter()
         self.assertEqual(converter('spam'), 'spam')
         self.assertIsNone(converter(''))
 
@@ -81,21 +81,21 @@ class ConfigurationOptionsTestCase(test.CdistTestCase):
         for x in cc.BooleanOption.BOOLEAN_STATES:
             self.assertEqual(option.translate(x),
                              cc.BooleanOption.BOOLEAN_STATES[x])
-        converter = option.converter()
+        converter = option.get_converter()
         self.assertRaises(ValueError, converter, 'of')
         for x in cc.BooleanOption.BOOLEAN_STATES:
             self.assertEqual(converter(x), cc.BooleanOption.BOOLEAN_STATES[x])
 
     def test_IntOption(self):
         option = cc.IntOption('test')
-        converter = option.converter()
+        converter = option.get_converter()
         self.assertRaises(ValueError, converter, 'x')
         for x in range(-5, 10):
             self.assertEqual(converter(str(x)), x)
 
     def test_LowerBoundIntOption(self):
         option = cc.LowerBoundIntOption('test', -1)
-        converter = option.converter()
+        converter = option.get_converter()
         self.assertRaises(ValueError, converter, -2)
         for x in range(-1, 10):
             self.assertEqual(converter(str(x)), x)
@@ -112,21 +112,21 @@ class ConfigurationOptionsTestCase(test.CdistTestCase):
     def test_SelectOption(self):
         valid_values = ('spam', 'eggs', 'ham', )
         option = cc.SelectOption('test', valid_values)
-        converter = option.converter()
+        converter = option.get_converter()
         self.assertRaises(ValueError, converter, 'spamspam')
         for x in valid_values:
             self.assertEqual(converter(x), x)
 
     def test_DelimitedValuesOption(self):
         option = cc.DelimitedValuesOption('test', ':')
-        converter = option.converter()
+        converter = option.get_converter()
         value = 'spam:eggs::ham'
         self.assertEqual(converter(value), ['spam', 'eggs', 'ham', ])
         self.assertIsNone(converter(''))
 
     def test_LogLevelOption(self):
         option = cc.LogLevelOption()
-        converter = option.converter()
+        converter = option.get_converter()
         value = str(logging.DEBUG)
         conv_val = converter(value)
         self.assertEqual(conv_val, cap.VERBOSE_DEBUG)