Aligned control char (un)escapement

2 files changed, 2 insertions, 4 deletions

diff --git a/pyx2xml.py b/pyx2xml.py
index 3e478d7..33d80b9 100755
--- a/pyx2xml.py
+++ b/pyx2xml.py
@@ -32,7 +32,7 @@ get_attrs = 0
 uris = {}
 lines = []
 
-unescape = lambda s: s.replace(r'\t','\t').replace(r'\\','\\')
+unescape = lambda s: s.replace(r'\t','\t').replace(r'\n','\n').replace(r'\\','\\')
 ns_handling = len(sys.argv) > 1 and sys.argv[1] == '-ns'
 if ns_handling:
    writeln = lambda s: lines.append(s)
diff --git a/xml2pyx.py b/xml2pyx.py
index 06850e9..0808fe9 100755
--- a/xml2pyx.py
+++ b/xml2pyx.py
@@ -31,9 +31,7 @@ class PyxConverter (xml.sax.handler.ContentHandler):
         pass
 
     def encode (self,s):
-        s = string.replace (s,"\\","\\\\")
-        s = string.replace (s,"\n","\\n")
-        s = string.replace (s,"\t","\\t")
+        return s.replace("\\",r"\\").replace("\n",r"\n").replace("\t",r"\t")
         return s
 
     def startElementNS (self, name, qname, attrs):