[Python-checkins] cpython (merge default -> default): merge
brett.cannon
python-checkins at python.org
Sun Apr 29 20:40:51 CEST 2012
http://hg.python.org/cpython/rev/40a05f9eb4c6
changeset: 76641:40a05f9eb4c6
parent: 76640:eb68502731dd
parent: 76639:925fbcfbbc45
user: Brett Cannon <brett at python.org>
date: Sun Apr 29 14:38:57 2012 -0400
summary:
merge
files:
Doc/library/stdtypes.rst | 2 +-
Lib/test/test_float.py | 10 ----------
2 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2459,7 +2459,7 @@
bytearray(b'z123fg')
>>> v[2:3] = b'spam'
Traceback (most recent call last):
- File "<stdin>", line 1, in <module>
+ File "<stdin>", line 1, in <module>
ValueError: memoryview assignment: lvalue and rvalue have different structures
>>> v[2:6] = b'spam'
>>> data
diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py
--- a/Lib/test/test_float.py
+++ b/Lib/test/test_float.py
@@ -860,16 +860,6 @@
self.assertEqual(str(1e300 * 1e300 * 0), "nan")
self.assertEqual(str(-1e300 * 1e300 * 0), "nan")
- def notest_float_nan(self):
- self.assertTrue(NAN.is_nan())
- self.assertFalse(INF.is_nan())
- self.assertFalse((0.).is_nan())
-
- def notest_float_inf(self):
- self.assertTrue(INF.is_inf())
- self.assertFalse(NAN.is_inf())
- self.assertFalse((0.).is_inf())
-
def test_inf_signs(self):
self.assertEqual(copysign(1.0, float('inf')), 1.0)
self.assertEqual(copysign(1.0, float('-inf')), -1.0)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list