tree ecb0f7b5d7a07abc2718f80e11afc9eaad49c649
parent c9e435ee2b3e9fc883799480ad1fdb506c8f6a3f
author Amaury Forgeot d'Arc <amauryfa@gmail.com> 1222806164 +0000
committer Amaury Forgeot d'Arc <amauryfa@gmail.com> 1222806164 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/py3k%4066702

Fix a probable merge glitch in r66695:
a redundant check that actually belongs to another function.