1 files changed, 7 insertions, 1 deletions
diff --git a/python/qpid/lexer.py b/python/qpid/lexer.py
index 87845560eb..ec28bbb91a 100644
--- a/python/qpid/lexer.py
+++ b/python/qpid/lexer.py
@@ -64,7 +64,7 @@ class Token:
     if self.value is None:
       return repr(self.type)
     else:
-      return "%s(%r)" % (self.type, self.value)
+      return "%s(%s)" % (self.type, self.value)
 
 
 class LexError(Exception):
@@ -96,6 +96,12 @@ class Lexer:
     self.types = types
     self.eof = eof
     self.rexp = rexp
+    self.byname = {}
+    for t in self.types + [eof]:
+      self.byname[t.name] = t
+
+  def type(self, name):
+    return self.byname[name]
 
   def lex(self, st):
     pos = 0