merge 3.2

This commit is contained in:
Benjamin Peterson 2011-07-14 10:03:53 -05:00
commit c917494528
1 changed files with 1 additions and 1 deletions

View File

@ -257,7 +257,7 @@ class FileCookieJarTests(unittest.TestCase):
"filename should not exist")
except IOError as exc:
# exactly IOError, not LoadError
self.assertEqual(exc.__class__, IOError)
self.assertIs(exc.__class__, IOError)
else:
self.fail("expected IOError for invalid filename")
# Invalid contents of cookies file (eg. bad magic string)