Merge 3.2

This commit is contained in:
Florent Xicluna 2011-10-28 14:52:29 +02:00
commit aabbda5354
27 changed files with 51 additions and 54 deletions

View file

@ -325,7 +325,7 @@ class Scanner:
if i == j:
break
action = self.lexicon[m.lastindex-1][1]
if hasattr(action, "__call__"):
if callable(action):
self.match = m
action = action(self, m.group())
if action is not None: