revert to re.finditer instead of re.findall
Automatic Py3k merge for testing