commit 1f3b4e12e8ba9cd896625ba02ea1ab6849ca3a07
author Florent Xicluna <florent.xicluna@gmail.com> Sun Mar 07 12:14:25 2010 +0000
committer Florent Xicluna <florent.xicluna@gmail.com> Sun Mar 07 12:14:25 2010 +0000
tree 42dc10540da9b1aff1d4e6cef51e4c11ce4f5b47
parent 2a4ab816332a67150fcc8ece255fb1ee8e66af83

Fix some py3k warnings in the standard library.

Lib/test/test_calendar.py

diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py
index 39d4fe8..fad517c 100644
--- a/Lib/test/test_calendar.py
+++ b/Lib/test/test_calendar.py
@@ -212,11 +212,9 @@
         self.assertEqual(calendar.isleap(2003), 0)
 
     def test_setfirstweekday(self):
-        # Silence a py3k warning claiming to affect Lib/calendar.py
-        with test_support.check_warnings():
-            self.assertRaises(ValueError, calendar.setfirstweekday, 'flabber')
-            self.assertRaises(ValueError, calendar.setfirstweekday, -1)
-            self.assertRaises(ValueError, calendar.setfirstweekday, 200)
+        self.assertRaises(ValueError, calendar.setfirstweekday, 'flabber')
+        self.assertRaises(ValueError, calendar.setfirstweekday, -1)
+        self.assertRaises(ValueError, calendar.setfirstweekday, 200)
         orig = calendar.firstweekday()
         calendar.setfirstweekday(calendar.SUNDAY)
         self.assertEqual(calendar.firstweekday(), calendar.SUNDAY)

Lib/test/test_memoryio.py

diff --git a/Lib/test/test_memoryio.py b/Lib/test/test_memoryio.py
index 13fa826..2b4c76e 100644
--- a/Lib/test/test_memoryio.py
+++ b/Lib/test/test_memoryio.py
@@ -133,9 +133,7 @@
         pos = memio.tell()
         self.assertEqual(memio.truncate(None), pos)
         self.assertEqual(memio.tell(), pos)
-        # Silence a py3k warning
-        with support.check_warnings():
-            self.assertRaises(TypeError, memio.truncate, '0')
+        self.assertRaises(TypeError, memio.truncate, '0')
         memio.close()
         self.assertRaises(ValueError, memio.truncate, 0)
 
@@ -172,9 +170,7 @@
         self.assertEqual(type(memio.read()), type(buf))
         memio.seek(0)
         self.assertEqual(memio.read(None), buf)
-        # Silence a py3k warning
-        with support.check_warnings():
-            self.assertRaises(TypeError, memio.read, '')
+        self.assertRaises(TypeError, memio.read, '')
         memio.close()
         self.assertRaises(ValueError, memio.read)