Now using %r everywhere we used %s + repr()

Author: Sylvain MARIE

valid8/common_syntax.py

@@ -193,8 +193,8 @@ def make_validation_func_callables(*vf_definition,                  # type: OneO
     supported tuples to use.
 
     >>> import sys, pytest
-    >>> if sys.version_info < (3, 0):
-    ...     pytest.skip('doctest skipped in python 2 because exception namespace is different but details matter')
+    >>> if sys.version_info < (3, 6):
+    ...     pytest.skip('doctest skipped for old python versions')
 
     >>> # two dummy validation callables
     >>> def is_big(x): return x > 10

valid8/composition.py

@@ -86,12 +86,12 @@ def get_details(self, compact_mode=False):
                 raise ValueError("Internal error, this should not happen - please report")
 
         # OrderedDict does not pretty print...
-        key_values_str = [repr(key) + ': ' + repr(val) for key, val in failures_for_print.items()]
+        key_values_str = ['%r: %r' % (key, val) for key, val in failures_for_print.items()]
         failures_str = '{' + ', '.join(key_values_str) + '}'
 
         # Note: we do note cite the value in the message since it is most probably available in inner messages [{val}]
         what = self.get_what()
-        possibly_value = "" if compact_mode else (" for value %s" % repr(self.wrong_value))
+        possibly_value = "" if compact_mode else (" for value %r" % self.wrong_value)
         return '%s%s. Successes: %s / Failures: %s.' % (what, possibly_value, self.successes, failures_str)
 
     def play_all_validators(self, validators, value, **ctx):

valid8/tests/readme/test_readme_index.py

@@ -83,7 +83,7 @@ def test_readme_usage_validator():
             v.alid = surf > 0
     e = exc_info.value
     assert str(e) == "Error validating [surface=1j]. " \
-                     "HasWrongType: Value should be an instance of %s. Wrong value: 1j." % repr(int)
+                     "HasWrongType: Value should be an instance of %r. Wrong value: 1j." % int
 
     from valid8 import assert_instance_of
     with pytest.raises(ValidationError) as exc_info:
@@ -92,7 +92,7 @@ def test_readme_usage_validator():
             v.alid = surf > 0
     e = exc_info.value
     assert str(e) == "Error validating [surface=1j]. " \
-                     "HasWrongType: Value should be an instance of %s. Wrong value: 1j." % repr(int)
+                     "HasWrongType: Value should be an instance of %r. Wrong value: 1j." % int
 
 
 def test_readme_usage_customization():
@@ -199,8 +199,8 @@ def build_house(name, surface=None):
     assert str(e) == "name should be a non-empty string. " \
                      "Error validating input [name=''] for function [build_house]. " \
                      "At least one validation function failed for value ''. " \
-                     "Successes: [\"instance_of_%s\"] / Failures: {'len(s) > 0': 'Returned False.'}." \
-                     "" % (repr(str), )
+                     "Successes: [\"instance_of_%r\"] / Failures: {'len(s) > 0': 'Returned False.'}." \
+                     "" % str
 
     from mini_lambda import s, x, l, Len
     from valid8 import validate_arg, validate_out

valid8/tests/readme/test_readme_usage.py

@@ -194,8 +194,8 @@ def test_usage_validators():
     with pytest.raises(ValidationError) as exc_info:
         validate_is_superclass_of_bool('typ', str)
     e = exc_info.value
-    assert str(e) == "Error validating [typ=%s]. InvalidValue: Function [%s] returned [False] for value %s." \
-                     "" % (repr(str), repr(_is_subclass_of_bool), repr(str))
+    assert str(e) == "Error validating [typ=%r]. InvalidValue: Function [%r] returned [False] for value %r." \
+                     "" % (str, _is_subclass_of_bool, str)
 
     validate_is_multiple_of_3('val', 21)  # ok
     with pytest.raises(ValidationError) as exc_info:

valid8/tests/test_entry_points_inline.py

@@ -35,7 +35,7 @@ def test_validate_():
         validate('surface', surf, instance_of=(int, ), min_value=0)
     e = exc_info.value
     assert str(e) == "Error validating [surface=1j]. " \
-                     "HasWrongType: Value should be an instance of %s. Wrong value: 1j." % repr(int)
+                     "HasWrongType: Value should be an instance of %r. Wrong value: 1j." % int
 
 
 def test_readme_usage_validate__customization():
@@ -49,7 +49,7 @@ def test_readme_usage_validate__customization():
                  help_msg="Surface should be a positive integer")
     e = exc_info.value
     assert str(e) == "Surface should be a positive integer. Error validating [surface=1j]. " \
-                     "HasWrongType: Value should be an instance of %s. Wrong value: 1j." % repr(int)
+                     "HasWrongType: Value should be an instance of %r. Wrong value: 1j." % int
 
     # (B) custom error types (recommended to provide unique applicative errors)
     class InvalidSurface(ValidationError):
@@ -70,7 +70,7 @@ class InvalidSurface(ValidationError):
     e = exc_info.value
     assert isinstance(e, InvalidSurface)
     assert str(e) == "Surface should be > 0, found 1j. Error validating [surface=1j]. " \
-                     "HasWrongType: Value should be an instance of %s. Wrong value: 1j." % repr(int)
+                     "HasWrongType: Value should be an instance of %r. Wrong value: 1j." % int
 
 
 def test_validator_context_manager():