tree 69ab7600924a3a6dd3ad897117ced744dff8d76d
parent 2e488fdebf109a13a464dbe76f85b8dbf846c7f7
author Neal Norwitz <nnorwitz@gmail.com> 1157947518 +0000
committer Neal Norwitz <nnorwitz@gmail.com> 1157947518 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/release25-maint%4051850

As mentioned on python-dev, reverting patch #1504333 because it introduced
an infinite loop in rev 47154.

This patch also adds a test to prevent the regression.

Will backport to 2.4 and head later.