cleanup in escape and unescape functions

This commit is contained in:
Krzysztof Jagiello
2011-06-04 19:37:44 +02:00
parent 6bb33791a1
commit 3831319f57

13
ts3.py
View File

@@ -38,6 +38,7 @@ class ConnectionError():
return 'Error connecting to host %s port %s' % (self.ip, self.port) return 'Error connecting to host %s port %s' % (self.ip, self.port)
ts3_escape = { '/': r"\/", ts3_escape = { '/': r"\/",
"\\", r'\\',
' ': r'\s', ' ': r'\s',
'|': r'\p', '|': r'\p',
"\a": r'\a', "\a": r'\a',
@@ -179,10 +180,12 @@ class TS3Proto():
""" """
if isinstance(value, int): return "%d" % value if isinstance(value, int):
value = value.replace("\\", r'\\') return str(value)
for i, j in ts3_escape.iteritems(): for i, j in ts3_escape.iteritems():
value = value.replace(i, j) value = value.replace(i, j)
return value return value
@staticmethod @staticmethod
@@ -195,10 +198,12 @@ class TS3Proto():
""" """
if isinstance(value, int): return "%d" % value if isinstance(value, int):
value = value.replace(r"\\", "\\") return str(value)
for i, j in ts3_escape.iteritems(): for i, j in ts3_escape.iteritems():
value = value.replace(j, i) value = value.replace(j, i)
return value return value