Fixing unicode strings in funcparserlib

[kiibohd-kll.git] / funcparserlib / parser.py

diff --git a/funcparserlib/parser.py b/funcparserlib/parser.py
index 92afebb18233a0f8349cbf7b7851906864345bfa..c92db006783d36c67886aa70443cb5da7a7e58fe 100644 (file)
--- a/funcparserlib/parser.py
+++ b/funcparserlib/parser.py
@@ -103,11 +103,11 @@ class Parser(object):
         Runs a parser wrapped into this object.
         """
         if debug:
-            log.debug(u'trying %s' % self.name)
+            log.debug('trying %s' % self.name)
         return self._run(tokens, s)
 
     def _run(self, tokens, s):
-        raise NotImplementedError(u'you must define() a parser')
+        raise NotImplementedError('you must define() a parser')
 
     def parse(self, tokens):
         """Sequence(a) -> b
@@ -126,8 +126,8 @@ class Parser(object):
             if len(tokens) > max:
                 tok = tokens[max]
             else:
-                tok = u'<EOF>'
-            raise NoParseError(u'%s: %s' % (e.msg, tok), e.state)
+                tok = '<EOF>'
+            raise NoParseError('%s: %s' % (e.msg, tok), e.state)
 
     def __add__(self, other):
         """Parser(a, b), Parser(a, c) -> Parser(a, _Tuple(b, c))
@@ -161,7 +161,7 @@ class Parser(object):
 
         # or in terms of bind and pure:
         # _add = self.bind(lambda x: other.bind(lambda y: pure(magic(x, y))))
-        _add.name = u'(%s , %s)' % (self.name, other.name)
+        _add.name = '(%s , %s)' % (self.name, other.name)
         return _add
 
     def __or__(self, other):
@@ -181,7 +181,7 @@ class Parser(object):
             except NoParseError as e:
                 return other.run(tokens, State(s.pos, e.state.max))
 
-        _or.name = u'(%s | %s)' % (self.name, other.name)
+        _or.name = '(%s | %s)' % (self.name, other.name)
         return _or
 
     def __rshift__(self, f):
@@ -202,7 +202,7 @@ class Parser(object):
 
         # or in terms of bind and pure:
         # _shift = self.bind(lambda x: pure(f(x)))
-        _shift.name = u'(%s)' % (self.name,)
+        _shift.name = '(%s)' % (self.name,)
         return _shift
 
     def bind(self, f):
@@ -217,7 +217,7 @@ class Parser(object):
             (v, s2) = self.run(tokens, s)
             return f(v).run(tokens, s2)
 
-        _bind.name = u'(%s >>=)' % (self.name,)
+        _bind.name = '(%s >>=)' % (self.name,)
         return _bind
 
 
@@ -237,11 +237,11 @@ class State(object):
         return unicode((self.pos, self.max))
 
     def __repr__(self):
-        return u'State(%r, %r)' % (self.pos, self.max)
+        return 'State(%r, %r)' % (self.pos, self.max)
 
 
 class NoParseError(Exception):
-    def __init__(self, msg=u'', state=None):
+    def __init__(self, msg='', state=None):
         self.msg = msg
         self.state = state
 
@@ -258,7 +258,7 @@ class _Ignored(object):
         self.value = value
 
     def __repr__(self):
-        return u'_Ignored(%s)' % repr(self.value)
+        return '_Ignored(%s)' % repr(self.value)
 
 
 @Parser
@@ -270,10 +270,10 @@ def finished(tokens, s):
     if s.pos >= len(tokens):
         return None, s
     else:
-        raise NoParseError(u'should have reached <EOF>', s)
+        raise NoParseError('should have reached <EOF>', s)
 
 
-finished.name = u'finished'
+finished.name = 'finished'
 
 
 def many(p):
@@ -295,7 +295,7 @@ def many(p):
         except NoParseError as e:
             return res, State(s.pos, e.state.max)
 
-    _many.name = u'{ %s }' % p.name
+    _many.name = '{ %s }' % p.name
     return _many
 
 
@@ -308,21 +308,21 @@ def some(pred):
     @Parser
     def _some(tokens, s):
         if s.pos >= len(tokens):
-            raise NoParseError(u'no tokens left in the stream', s)
+            raise NoParseError('no tokens left in the stream', s)
         else:
             t = tokens[s.pos]
             if pred(t):
                 pos = s.pos + 1
                 s2 = State(pos, max(pos, s.max))
                 if debug:
-                    log.debug(u'*matched* "%s", new state = %s' % (t, s2))
+                    log.debug('*matched* "%s", new state = %s' % (t, s2))
                 return t, s2
             else:
                 if debug:
-                    log.debug(u'failed "%s", state = %s' % (t, s))
-                raise NoParseError(u'got unexpected token', s)
+                    log.debug('failed "%s", state = %s' % (t, s))
+                raise NoParseError('got unexpected token', s)
 
-    _some.name = u'(some)'
+    _some.name = '(some)'
     return _some
 
 
@@ -332,7 +332,7 @@ def a(value):
     Returns a parser that parses a token that is equal to the value value.
     """
     name = getattr(value, 'name', value)
-    return some(lambda t: t == value).named(u'(a "%s")' % (name,))
+    return some(lambda t: t == value).named('(a "%s")' % (name,))
 
 
 def pure(x):
@@ -340,7 +340,7 @@ def pure(x):
     def _pure(_, s):
         return x, s
 
-    _pure.name = u'(pure %r)' % (x,)
+    _pure.name = '(pure %r)' % (x,)
     return _pure
 
 
@@ -352,7 +352,7 @@ def maybe(p):
     NOTE: In a statically typed language, the type Maybe b could be more
     approprieate.
     """
-    return (p | pure(None)).named(u'[ %s ]' % (p.name,))
+    return (p | pure(None)).named('[ %s ]' % (p.name,))
 
 
 def skip(p):
@@ -370,7 +370,7 @@ def oneplus(p):
     Returns a parser that applies the parser p one or more times.
     """
     q = p + many(p) >> (lambda x: [x[0]] + x[1])
-    return q.named(u'(%s , { %s })' % (p.name, p.name))
+    return q.named('(%s , { %s })' % (p.name, p.name))
 
 
 def with_forward_decls(suspension):
@@ -399,7 +399,7 @@ def forward_decl():
 
     @Parser
     def f(tokens, s):
-        raise NotImplementedError(u'you must define() a forward_decl somewhere')
+        raise NotImplementedError('you must define() a forward_decl somewhere')
 
     return f