summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2003-07-15 20:57:35 (GMT)
committerRaymond Hettinger <python@rcn.com>2003-07-15 20:57:35 (GMT)
commit158af581ae68bd858eae1319845554cfdb742cc4 (patch)
treeecb160ff3ed561638d58078fb4d21ac42e81d49e
parente37b4ed24e71a9045ec0e552ecac466126481fdc (diff)
downloadcpython-158af581ae68bd858eae1319845554cfdb742cc4.zip
cpython-158af581ae68bd858eae1319845554cfdb742cc4.tar.gz
cpython-158af581ae68bd858eae1319845554cfdb742cc4.tar.bz2
Fixed test and converted to unittest format.
Checking // would call floor division but did not test that true division had become the default with 'from __future__ import division'.
-rw-r--r--Lib/test/test_future3.py31
1 files changed, 25 insertions, 6 deletions
diff --git a/Lib/test/test_future3.py b/Lib/test/test_future3.py
index 8f8c274..ed23567 100644
--- a/Lib/test/test_future3.py
+++ b/Lib/test/test_future3.py
@@ -1,11 +1,30 @@
from __future__ import nested_scopes
from __future__ import division
-from __future__ import nested_scopes
-def f(x):
- def g(y):
- return y // x
- return g
+import unittest
+from test import test_support
+
+x = 2
+def nester():
+ x = 3
+ def inner():
+ return x
+ return inner()
+
+
+class TestFuture(unittest.TestCase):
+
+ def test_floor_div_operator(self):
+ self.assertEqual(7 // 2, 3)
+
+ def test_true_div_as_default(self):
+ self.assertAlmostEqual(7 / 2, 3.5)
+
+ def test_nested_scopes(self):
+ self.assertEqual(nester(), 3)
+def test_main():
+ test_support.run_unittest(TestFuture)
-print f(2)(5)
+if __name__ == "__main__":
+ test_main()