From 3831319f57b52a946c18db33661e83fc1a946a4e Mon Sep 17 00:00:00 2001 From: Krzysztof Jagiello Date: Sat, 4 Jun 2011 19:37:44 +0200 Subject: [PATCH] cleanup in escape and unescape functions --- ts3.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ts3.py b/ts3.py index 32c5078..c915945 100644 --- a/ts3.py +++ b/ts3.py @@ -38,6 +38,7 @@ class ConnectionError(): return 'Error connecting to host %s port %s' % (self.ip, self.port) ts3_escape = { '/': r"\/", + "\\", r'\\', ' ': r'\s', '|': r'\p', "\a": r'\a', @@ -179,10 +180,12 @@ class TS3Proto(): """ - if isinstance(value, int): return "%d" % value - value = value.replace("\\", r'\\') + if isinstance(value, int): + return str(value) + for i, j in ts3_escape.iteritems(): value = value.replace(i, j) + return value @staticmethod @@ -195,10 +198,12 @@ class TS3Proto(): """ - if isinstance(value, int): return "%d" % value - value = value.replace(r"\\", "\\") + if isinstance(value, int): + return str(value) + for i, j in ts3_escape.iteritems(): value = value.replace(j, i) + return value