restore intended behaviour

Author: albu-diku

mig/shared/base.py

@@ -510,14 +510,14 @@ def force_utf8(val, highlight=''):
     return codecs.encode("%s%s%s" % (highlight, val, highlight), 'utf8')
 
 
-def _walk_and_covert_recursive(input_obj, highlight='', _as_bytes=False, _force_primitive=None, _force_recursive=None):
+def _walk_and_convert_recursive(input_obj, highlight='', _as_bytes=False, _force_primitive=None, _force_recursive=None):
     thetype = type(input_obj)
     if issubclass(thetype, dict):
         return {_force_recursive(i, highlight): _force_recursive(j, highlight) for (i, j) in
                 input_obj.items()}
     elif issubclass(thetype, (list, tuple)):
         return thetype((_force_recursive(i, highlight) for i in input_obj))
-    elif not is_unicode(input_obj):
+    elif is_unicode(input_obj):
         return _force_primitive(input_obj, highlight)
     else:
         return input_obj
@@ -528,7 +528,7 @@ def force_utf8_rec(input_obj, highlight=''):
     dictionaries with nested unicode strings to a pure utf8 version. Actual
     changes are marked out with the highlight string if given.
     """
-    return _walk_and_covert_recursive(input_obj, highlight, _force_primitive=force_utf8, _force_recursive=force_utf8_rec)
+    return _walk_and_convert_recursive(input_obj, highlight, _force_primitive=force_utf8, _force_recursive=force_utf8_rec)
 
 
 def force_unicode(val, highlight=''):
@@ -548,7 +548,7 @@ def force_unicode_rec(input_obj, highlight=''):
     dictionaries with nested utf8 strings to a pure unicode version. Actual
     changes are marked out with the highlight string if given.
     """
-    return _walk_and_covert_recursive(input_obj, highlight, _force_primitive=force_unicode, _force_recursive=force_unicode_rec)
+    return _walk_and_convert_recursive(input_obj, highlight, _force_primitive=force_unicode, _force_recursive=force_unicode_rec)
 
 
 def _force_default_coding(input_obj, kind, highlight=''):

tests/test_mig_shared_base.py

@@ -33,7 +33,7 @@
 
 from tests.support import PY2, MigTestCase, testmain
 
-from mig.shared.base import force_default_fs_coding_rec, force_default_str_coding_rec
+from mig.shared.base import force_default_fs_coding_rec, force_default_str_coding_rec, force_utf8
 
 DUMMY_BYTECHARS = b'DEADBEEF'
 DUMMY_BYTESRAW = binascii.unhexlify('DEADBEEF') # 4 bytes
@@ -46,22 +46,22 @@ class MigSharedBase__force_default_fs_coding_rec(MigTestCase):
     def test_encode_a_string(self):
         output = force_default_fs_coding_rec('foobar')
 
-        self.assertEqual(output, 'foobar')
+        self.assertEqual(output, b'foobar')
 
     def test_encode_within_a_dict(self):
         output = force_default_fs_coding_rec({ 'key': 'value' })
 
-        self.assertEqual(output, { 'key': 'value' })
+        self.assertEqual(output, { b'key': b'value' })
 
     def test_encode_within_a_list(self):
         output = force_default_fs_coding_rec(['foo', 'bar', 'baz'])
 
-        self.assertEqual(output, ['foo', 'bar', 'baz'])
+        self.assertEqual(output, [b'foo', b'bar', b'baz'])
 
     def test_encode_within_a_tuple(self):
         output = force_default_fs_coding_rec(('foo', 'bar', 'baz'))
 
-        self.assertEqual(output, ('foo', 'bar', 'baz'))
+        self.assertEqual(output, (b'foo', b'bar', b'baz'))
 
 
 class MigSharedBase__force_default_str_coding_rec(MigTestCase):
@@ -88,5 +88,14 @@ def test_encode_within_a_tuple(self):
         self.assertEqual(output, ('foo', 'bar', 'baz'))
 
 
+class MigSharedBase__force_utf8(MigTestCase):
+    """Unit tests of mig.shared.base force_utf8()"""
+
+    def test_encode_a_string(self):
+        output = force_utf8('foobar')
+
+        self.assertEqual(output, b'foobar')
+
+
 if __name__ == '__main__':
     testmain()