pull out the byte conversion

Author: albu-diku

mig/shared/base.py

@@ -519,8 +519,6 @@ def _walk_and_covert_recursive(input_obj, highlight='', _as_bytes=False, _force_
         return thetype((_force_recursive(i, highlight) for i in input_obj))
     elif not is_unicode(input_obj):
         return _force_primitive(input_obj, highlight)
-    elif not PY2 and _as_bytes:
-        return _force_primitive(input_obj, highlight)
     else:
         return input_obj
 
@@ -530,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, _as_bytes=True, _force_primitive=force_utf8, _force_recursive=force_utf8_rec)
+    return _walk_and_covert_recursive(input_obj, highlight, _force_primitive=force_utf8, _force_recursive=force_utf8_rec)
 
 
 def force_unicode(val, highlight=''):

tests/test_mig_shared_base.py

@@ -40,38 +40,28 @@
 DUMMY_UNICODE = u'UniCode123½¾µßðþđŋħĸþł@ª€£$¥©®'
 
 
-if PY2:
-    def _strbytes(value):
-        assert isinstance(value, str)
-        return value
-else:
-    def _strbytes(value):
-        assert isinstance(value, str)
-        return bytes(value, 'utf8')
-
-
 class MigSharedBase__force_default_fs_coding_rec(MigTestCase):
     """Unit tests of mig.shared.base force_default_fs_coding_rec()"""
 
     def test_encode_a_string(self):
         output = force_default_fs_coding_rec('foobar')
 
-        self.assertEqual(output, _strbytes('foobar'))
+        self.assertEqual(output, 'foobar')
 
     def test_encode_within_a_dict(self):
         output = force_default_fs_coding_rec({ 'key': 'value' })
 
-        self.assertEqual(output, { _strbytes('key'): _strbytes('value') })
+        self.assertEqual(output, { 'key': 'value' })
 
     def test_encode_within_a_list(self):
         output = force_default_fs_coding_rec(['foo', 'bar', 'baz'])
 
-        self.assertEqual(output, [_strbytes('foo'), _strbytes('bar'), _strbytes('baz')])
+        self.assertEqual(output, ['foo', 'bar', 'baz'])
 
     def test_encode_within_a_tuple(self):
         output = force_default_fs_coding_rec(('foo', 'bar', 'baz'))
 
-        self.assertEqual(output, (_strbytes('foo'), _strbytes('bar'), _strbytes('baz')))
+        self.assertEqual(output, ('foo', 'bar', 'baz'))
 
 
 class MigSharedBase__force_default_str_coding_rec(MigTestCase):