clean code

atx/strutils.py

@@ -37,6 +37,21 @@ def decode(s, encodings=['utf-8', 'gbk', 'cp936']):
     raise UnicodeDecodeError(','.join(encodings), "", 0, len(s or ''), "string: '%s'" % repr(s))
 
 
+def to_string(s, encoding='utf-8'):
+    """
+    Accept unicode(py2) or bytes(py3)
+
+    Returns:
+        py2 type: str
+        py3 type: str
+    """
+    if six.PY2:
+        return s.encode(encoding)
+    if isinstance(s, bytes):
+        return s.decode(encoding)
+    return s
+
+
 if __name__ == '__main__':
     print('Hello 世界!')
     print(encode('Hello 世界!'))

tests/runtest.sh

@@ -11,4 +11,5 @@ cd $(dirname $0)
 python -mpytest -v \
 	test_ext_report.py \
 	test_dummy.py \
+	test_strutils.py \
 	test_base.py "$@"

tests/test_strutils.py

@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from atx import strutils
+import six
+
+
+def test_encode():
+    v = strutils.encode('hello')
+    assert not isinstance(v, six.text_type)
+
+    v = strutils.encode(u'hello')
+    assert not isinstance(v, six.text_type)
+
+
+def test_to_string():
+    v = strutils.to_string('hello')
+    assert isinstance(v, str) # no matter py2 or py3