support \uXXXX as well as \xXX in args field

[dbuscron] / dbuscron / parser.py

diff --git a/dbuscron/parser.py b/dbuscron/parser.py
index a6f1c1d..6937e14 100644 (file)
--- a/dbuscron/parser.py
+++ b/dbuscron/parser.py
@@ -1,7 +1,25 @@
+# encoding: utf-8
 from __future__ import with_statement
 import re
 from dbuscron.bus import DbusBus
 
+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:
         head, tail = args[0], args[1:]
@@ -70,7 +88,7 @@ class CrontabParser(object):
 
                 parts = self.__fields_sep.split(line, 8)
                 if len(parts) < 9:
-                    parts = self.__envvar_sep(line, 1)
+                    parts = self.__envvar_sep.split(line, 1)
                     if len(parts) == 2:
                         self.__environ[parts[0]] = parts[1]
                         continue
@@ -95,11 +113,11 @@ class CrontabParser(object):
                         raise CrontabParserError('Unexpected bus value', lineno, expected=('S', 's', '*'))
 
                     if r[7]:
-                        r[7] = r[7].split(';')
+                        r[7] = map(unescape, r[7].split(';'))
 
                     ruled = dict()
                     for i, f in enumerate(self.__fields):
-                        if self.__fields_chk[f]:
+                        if r[i] is not None and self.__fields_chk[f]:
                             if isinstance(self.__fields_chk[f], tuple):
                                 if r[i] not in self.__fields_chk[f]:
                                     raise CrontabParserError('Unexpected %s value' % (f.strip('_')), lineno,
@@ -111,39 +129,15 @@ class CrontabParser(object):
 
                     yield ruled, command
 
-class OptionsParser(dict):
-    def __init__(self, opts, args=None):
-        super(OptionsParser, self).__init__()
-
-        if args is None:
-            import sys
-            args = sys.argv[1:]
-
-        from getopt import getopt
-        go, _ = getopt(args, opts)
-
-        for o, v in go:
-            k = o.strip('-')
-            withval = k+':' in opts
-
-            if self.has_key(k):
-                if withval:
-                    if isinstance(self[k], list):
-                        self[k].append(v)
-                    else:
-                        self[k] = [ self[k], v ]
-
-                else:
-                    self[k] += 1
-
-            else:
-                self[k] = v if withval else 1
+def OptionsParser(args=None, help=u'', **opts):
 
-    def __getitem__(self, k):
-        if not self.has_key(k):
-            return False
-        return super(OptionsParser, self).__getitem__(k)
+    from optparse import OptionParser
+    import dbuscron
+    parser = OptionParser(usage=help, version="%prog "+dbuscron.__version__)
+    for opt, desc in opts.iteritems():
+        names = desc.pop('names')
+        desc['dest'] = opt
+        parser.add_option(*names, **desc)
 
-    def __getattr__(self, k):
-        return self[k]
+    return parser.parse_args(args)[0]