]> granicus.if.org Git - python/commitdiff
Silence deprecation warning in test_mmap for ValueError.message.
authorTerry Jan Reedy <tjreedy@udel.edu>
Sun, 1 Sep 2013 01:14:00 +0000 (21:14 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sun, 1 Sep 2013 01:14:00 +0000 (21:14 -0400)
Replacement is from 3.3, with 'p' added to make '...Regexp'.

Lib/test/test_mmap.py

index f84b20aa441a4d02b7bd41c2f029a8fdfee89d88..9fd218418ce5eb266e949d00270c50d8f6395073 100644 (file)
@@ -470,14 +470,10 @@ class MmapTests(unittest.TestCase):
         f = open (TESTFN, 'w+b')
         f.close()
         with open(TESTFN, "rb") as f :
-            try:
-                m = mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ)
-                m.close()
-                self.fail("should not have been able to mmap empty file")
-            except ValueError as e:
-                self.assertEqual(e.message, "cannot mmap an empty file")
-            except:
-                self.fail("unexpected exception: " + str(e))
+            self.assertRaisesRegexp(ValueError,
+                                   "cannot mmap an empty file",
+                                   mmap.mmap, f.fileno(), 0,
+                                   access=mmap.ACCESS_READ)
 
     def test_offset (self):
         f = open (TESTFN, 'w+b')