summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-12-20 20:23:49 +0000
committerMark Dickinson <dickinsm@gmail.com>2009-12-20 20:23:49 +0000
commit828ce4af7b164783df86013b78aece9c1bfeb21e (patch)
treeb638a589d5e48018a3b35cb392faf27cbb870ee3
parent779d274b0ea6a2545b6b50d57750381eb1f36ad1 (diff)
downloadcpython-git-828ce4af7b164783df86013b78aece9c1bfeb21e.tar.gz
Merged revisions 76945 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r76945 | mark.dickinson | 2009-12-20 20:23:01 +0000 (Sun, 20 Dec 2009) | 1 line Silence -3 warnings. Thanks Florent Xicluna. ........
-rw-r--r--Lib/test/test_math.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/test/test_math.py b/Lib/test/test_math.py
index c82c775cce..0e52e409c6 100644
--- a/Lib/test/test_math.py
+++ b/Lib/test/test_math.py
@@ -350,7 +350,8 @@ class MathTests(unittest.TestCase):
def testFrexp(self):
self.assertRaises(TypeError, math.frexp)
- def testfrexp(name, (mant, exp), (emant, eexp)):
+ def testfrexp(name, result, expected):
+ (mant, exp), (emant, eexp) = result, expected
if abs(mant-emant) > eps or exp != eexp:
self.fail('%s returned %r, expected %r'%\
(name, (mant, exp), (emant,eexp)))
@@ -540,7 +541,8 @@ class MathTests(unittest.TestCase):
def testModf(self):
self.assertRaises(TypeError, math.modf)
- def testmodf(name, (v1, v2), (e1, e2)):
+ def testmodf(name, result, expected):
+ (v1, v2), (e1, e2) = result, expected
if abs(v1-e1) > eps or abs(v2-e2):
self.fail('%s returned %r, expected %r'%\
(name, (v1,v2), (e1,e2)))