equivalent attributes in a few more spots. This closes SF patch http://www.python.org/sf/562373
Attach a file by drag & drop or click to upload
