diff options
author | Florent Xicluna <florent.xicluna@gmail.com> | 2011-10-28 12:52:29 (GMT) |
---|---|---|
committer | Florent Xicluna <florent.xicluna@gmail.com> | 2011-10-28 12:52:29 (GMT) |
commit | aabbda5354407cfe35097c7f17717a716a3d80c4 (patch) | |
tree | e15e7fe42975e08e567879ec8a949d4986ca4493 /Lib/re.py | |
parent | ac73b0c95e352563ecf0a4643b30215b9bdee1a5 (diff) | |
parent | 5d1155c08edf7f53eca804b2b6538636c2dfe711 (diff) | |
download | cpython-aabbda5354407cfe35097c7f17717a716a3d80c4.zip cpython-aabbda5354407cfe35097c7f17717a716a3d80c4.tar.gz cpython-aabbda5354407cfe35097c7f17717a716a3d80c4.tar.bz2 |
Merge 3.2
Diffstat (limited to 'Lib/re.py')
-rw-r--r-- | Lib/re.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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: |