Remove Python2 uncompliant codes

tests.conf

@@ -0,0 +1,15 @@
+classifier_config_dict = {
+    'sklearn.naive_bayes.GaussianNB': {
+    },
+
+    'sklearn.naive_bayes.BernoulliNB': {
+        'alpha': [1e-3, 1e-2, 1e-1, 1., 10., 100.],
+        'fit_prior': [True, False]
+    },
+
+    'sklearn.naive_bayes.MultinomialNB': {
+        'alpha': [1e-3, 1e-2, 1e-1, 1., 10., 100.],
+        'fit_prior': [True, False]
+    }
+}
+

tests.py

@@ -182,8 +182,8 @@ def test_set_params_2():
     assert tpot_obj.generations == 3
 
 
-def test_lite_params():
-    """Assert that TPOT uses TPOT's lite dictionary of operators when config_dict is 'TPOT light' or 'TPOT MDR'."""
+def test_conf_dict():
+    """Assert that TPOT uses the pre-configured dictionary of operators when config_dict is 'TPOT light' or 'TPOT MDR'."""
     tpot_obj = TPOTClassifier(config_dict='TPOT light')
     assert tpot_obj.config_dict == classifier_config_dict_light
 
@@ -196,6 +196,33 @@ def test_lite_params():
     assert_raises(TypeError, TPOTRegressor, config_dict='TPOT MDR')
 
 
+def test_conf_dict_2():
+    """Assert that TPOT uses a custom dictionary of operators when config_dict is Python dictionary."""
+    tpot_obj = TPOTClassifier(config_dict=tpot_mdr_classifier_config_dict)
+    assert tpot_obj.config_dict == tpot_mdr_classifier_config_dict
+
+
+def test_conf_dict_3():
+    """Assert that TPOT uses a custom dictionary of operators when config_dict is the path of Python dictionary."""
+    tpot_obj = TPOTRegressor(config_dict='tests.conf')
+    tested_config_dict = {
+        'sklearn.naive_bayes.GaussianNB': {
+        },
+
+        'sklearn.naive_bayes.BernoulliNB': {
+            'alpha': [1e-3, 1e-2, 1e-1, 1., 10., 100.],
+            'fit_prior': [True, False]
+        },
+
+        'sklearn.naive_bayes.MultinomialNB': {
+            'alpha': [1e-3, 1e-2, 1e-1, 1., 10., 100.],
+            'fit_prior': [True, False]
+        }
+    }
+    assert isinstance(tpot_obj.config_dict, dict)
+    assert tpot_obj.config_dict == tested_config_dict
+
+
 def test_random_ind():
     """Assert that the TPOTClassifier can generate the same pipeline with same random seed."""
     tpot_obj = TPOTClassifier(random_state=43)

tpot/base.py

@@ -909,9 +909,10 @@ def _generate(self, pset, min_, max_, condition, type_=None):
                 except IndexError:
                     _, _, traceback = sys.exc_info()
                     raise IndexError(
-                        'The gp.generate function tried to add a terminal of '
-                        'type \'%s\', but there is none available.' % (type_,)
-                    ).with_traceback(traceback)
+                        'The gp.generate function tried to add '
+                        'a terminal of type {}, but there is'
+                        'none available. {}'.format(type_, traceback)
+                        )
                 if inspect.isclass(term):
                     term = term()
                 expr.append(term)
@@ -921,11 +922,11 @@ def _generate(self, pset, min_, max_, condition, type_=None):
                 except IndexError:
                     _, _, traceback = sys.exc_info()
                     raise IndexError(
-                        'The gp.generate function tried to add a terminal of '
-                        'type \'%s\', but there is none available.' % (type_,)
-                    ).with_traceback(traceback)
+                        'The gp.generate function tried to add '
+                        'a primitive of type {}, but there is'
+                        'none available. {}'.format(type_, traceback)
+                        )
                 expr.append(prim)
                 for arg in reversed(prim.args):
                     stack.append((depth+1, arg))
-
         return expr