summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-09-01 01:14:00 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2013-09-01 01:14:00 (GMT)
commit71b2ded05e55a044cbba9257ed43ed34b5e9648c (patch)
treeaa01657fb1e478a63189f09af79ad4065e9895b1
parent0c534a46242dd65914090429385588d852188011 (diff)
downloadcpython-71b2ded05e55a044cbba9257ed43ed34b5e9648c.zip
cpython-71b2ded05e55a044cbba9257ed43ed34b5e9648c.tar.gz
cpython-71b2ded05e55a044cbba9257ed43ed34b5e9648c.tar.bz2
Silence deprecation warning in test_mmap for ValueError.message.
Replacement is from 3.3, with 'p' added to make '...Regexp'.
-rw-r--r--Lib/test/test_mmap.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
index f84b20a..9fd2184 100644
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -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')