Fix: Keep unicode/str type in shell_escape()

Author: pyroscope

debian/changelog

@@ -1,3 +1,9 @@
+pyrobase (0.5.2) precise; urgency=low
+
+  * Fix: Keep unicode/str type in shell_escape()
+
+ -- pyroscope <[email protected]>  Mon, 01 Jan 2018 14:03:46 +0100
+
 pyrobase (0.5.1) precise; urgency=low
 
   * Removed support for Python 2.6

src/pyrobase/osutil.py

@@ -24,4 +24,8 @@
 
 def shell_escape(text, _safe=re.compile(r"^[-._,+a-zA-Z0-9]+$")):
     """Escape given string according to shell rules."""
-    return text if _safe.match(text) else "'%s'" % text.replace("'", r"'\''")
+    if not text or _safe.match(text):
+        return text
+
+    squote = type(text)("'")
+    return squote + text.replace(squote, type(text)(r"'\''")) + squote

src/tests/test_osutil.py

@@ -33,6 +33,9 @@ def test_shell_escape(self):
             ("!bang",       "'!bang'"),
             ("d\"q",        "'d\"q'"),
             ("s'q",         r"'s'\''q'"),
+            (b"abc",        b"abc"),
+            (b"!bang",      b"'!bang'"),
+            (b"\xA0",       b"'\xA0'"),
         ]
         for val, expected in cases:
             result = osutil.shell_escape(val)