From: Konstantin Stepanov <kstep@p-nut.info>
Date: Tue, 21 Dec 2010 09:20:18 +0000 (+0200)
Subject: support \uXXXX as well as \xXX in args field
X-Git-Tag: v1.4.0~2
X-Git-Url: https://vcs.maemo.org/git/?p=dbuscron;a=commitdiff_plain;h=de71292821e4f11565b16e7a32c0f370c5ba43d2

support \uXXXX as well as \xXX in args field
---

diff --git a/dbuscron/parser.py b/dbuscron/parser.py
index 2365423..6937e14 100644
--- a/dbuscron/parser.py
+++ b/dbuscron/parser.py
@@ -3,12 +3,22 @@ from __future__ import with_statement
 import re
 from dbuscron.bus import DbusBus
 
-def unescape(value):
-    if not value or r'\x' not in value:
-        return value
-
-    r = re.compile(r'\\x([0-9A-Fa-f]{2})')
-    return r.sub(lambda m: chr(int(m.group(1), 16)), value)
+def unescape_():
+    h = '[0-9A-Fa-f]'
+    r = re.compile(r'\\x('+h+r'{2})|\\u('+h+'{4})')
+    def unescape(value):
+        if not (value and \
+            (r'\x' in value or r'\u' in value)):
+            return value
+
+        return r.sub(\
+            lambda m: chr(int(m.group(1), 16)) \
+                if m.group(1) is not None else \
+                    unichr(int(m.group(2), 16))\
+                        .encode('utf-8'),\
+            value)
+    return unescape
+unescape = unescape_()
 
 def product(*args):
     if args: