Hi!  Thanks for the report and patch ideas.  Would both of your fix ideas preserve backward compatibility?  If yes, we should take the one that makes the code easier to read; if no, we should take the most compatible.  Would you be interested in making a patch?  If so, helpful guidelines are available under http://docs.python.org/devguide; if not, someone else will do it.