summaryrefslogtreecommitdiff
path: root/Lib/re.py
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2011-10-28 14:52:29 +0200
committerFlorent Xicluna <florent.xicluna@gmail.com>2011-10-28 14:52:29 +0200
commitaabbda5354407cfe35097c7f17717a716a3d80c4 (patch)
treee15e7fe42975e08e567879ec8a949d4986ca4493 /Lib/re.py
parentac73b0c95e352563ecf0a4643b30215b9bdee1a5 (diff)
parent5d1155c08edf7f53eca804b2b6538636c2dfe711 (diff)
downloadcpython-git-aabbda5354407cfe35097c7f17717a716a3d80c4.tar.gz
Merge 3.2
Diffstat (limited to 'Lib/re.py')
-rw-r--r--Lib/re.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/re.py b/Lib/re.py
index 4b90b3f328..228c4f1eec 100644
--- a/Lib/re.py
+++ b/Lib/re.py
@@ -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: