Merged revisions 60053-60078 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60054 | christian.heimes | 2008-01-18 20:12:56 +0100 (Fri, 18 Jan 2008) | 1 line
Silence Coverity false alerts with CIDs #172, #183, #184
........
r60057 | guido.van.rossum | 2008-01-18 21:56:30 +0100 (Fri, 18 Jan 2008) | 3 lines
Fix an edge case whereby the __del__() method of a classic class could
create a new weakref to the object.
........
r60058 | raymond.hettinger | 2008-01-18 22:14:58 +0100 (Fri, 18 Jan 2008) | 1 line
Better variable name in an example.
........
r60063 | guido.van.rossum | 2008-01-19 00:05:40 +0100 (Sat, 19 Jan 2008) | 3 lines
This got fixed for classic classes in r60057,
and backported to 2.5.2 in 60056.
........
r60068 | jeffrey.yasskin | 2008-01-19 10:56:06 +0100 (Sat, 19 Jan 2008) | 4 lines
Several tweaks: add construction from strings and .from_decimal(), change
__init__ to __new__ to enforce immutability, and remove "rational." from repr
and the parens from str.
........
r60069 | georg.brandl | 2008-01-19 11:11:27 +0100 (Sat, 19 Jan 2008) | 2 lines
Fix markup.
........
r60070 | georg.brandl | 2008-01-19 11:16:09 +0100 (Sat, 19 Jan 2008) | 3 lines
Amend curses docs by info how to write non-ascii characters.
Thanks to Jeroen Ruigrok van der Werven.
........
r60071 | georg.brandl | 2008-01-19 11:18:07 +0100 (Sat, 19 Jan 2008) | 2 lines
Indentation normalization.
........
r60073 | facundo.batista | 2008-01-19 13:32:27 +0100 (Sat, 19 Jan 2008) | 5 lines
Fix issue #1822: MIMEMultipart.is_multipart() behaves correctly for a
just-created (and empty) instance. Added tests for this. Thanks
Jonathan Share.
........
r60074 | andrew.kuchling | 2008-01-19 14:33:20 +0100 (Sat, 19 Jan 2008) | 1 line
Polish sentence
........
r60075 | christian.heimes | 2008-01-19 14:46:06 +0100 (Sat, 19 Jan 2008) | 1 line
Added unit test to verify that threading.local doesn't cause ref leaks. It seems that the thread local storage always keeps the storage of the last stopped thread alive. Can anybody comment on it, please?
........
r60076 | christian.heimes | 2008-01-19 16:06:09 +0100 (Sat, 19 Jan 2008) | 1 line
Update for threading.local test.
........
r60077 | andrew.kuchling | 2008-01-19 16:16:37 +0100 (Sat, 19 Jan 2008) | 1 line
Polish sentence
........
r60078 | georg.brandl | 2008-01-19 16:22:16 +0100 (Sat, 19 Jan 2008) | 2 lines
Fix typos.
........
diff --git a/Lib/test/test_rational.py b/Lib/test/test_rational.py
index 952a97f..e57adce 100644
--- a/Lib/test/test_rational.py
+++ b/Lib/test/test_rational.py
@@ -45,6 +45,44 @@
self.assertRaises(TypeError, R, 1.5)
self.assertRaises(TypeError, R, 1.5 + 3j)
+ self.assertRaises(TypeError, R, R(1, 2), 3)
+ self.assertRaises(TypeError, R, "3/2", 3)
+
+ def testFromString(self):
+ self.assertEquals((5, 1), _components(R("5")))
+ self.assertEquals((3, 2), _components(R("3/2")))
+ self.assertEquals((3, 2), _components(R(" \n +3/2")))
+ self.assertEquals((-3, 2), _components(R("-3/2 ")))
+ self.assertEquals((3, 2), _components(R(" 03/02 \n ")))
+ self.assertEquals((3, 2), _components(R(" 03/02 \n ")))
+
+ self.assertRaisesMessage(
+ ZeroDivisionError, "Rational(3, 0)",
+ R, "3/0")
+ self.assertRaisesMessage(
+ ValueError, "Invalid literal for Rational: 3/",
+ R, "3/")
+ self.assertRaisesMessage(
+ ValueError, "Invalid literal for Rational: 3 /2",
+ R, "3 /2")
+ self.assertRaisesMessage(
+ # Denominators don't need a sign.
+ ValueError, "Invalid literal for Rational: 3/+2",
+ R, "3/+2")
+ self.assertRaisesMessage(
+ # Imitate float's parsing.
+ ValueError, "Invalid literal for Rational: + 3/2",
+ R, "+ 3/2")
+ self.assertRaisesMessage(
+ # Only parse fractions, not decimals.
+ ValueError, "Invalid literal for Rational: 3.2",
+ R, "3.2")
+
+ def testImmutable(self):
+ r = R(7, 3)
+ r.__init__(2, 15)
+ self.assertEquals((7, 3), _components(r))
+
def testFromFloat(self):
self.assertRaisesMessage(
TypeError, "Rational.from_float() only takes floats, not 3 (int)",
@@ -72,6 +110,31 @@
TypeError, "Cannot convert nan to Rational.",
R.from_float, nan)
+ def testFromDecimal(self):
+ self.assertRaisesMessage(
+ TypeError,
+ "Rational.from_decimal() only takes Decimals, not 3 (int)",
+ R.from_decimal, 3)
+ self.assertEquals(R(0), R.from_decimal(Decimal("-0")))
+ self.assertEquals(R(5, 10), R.from_decimal(Decimal("0.5")))
+ self.assertEquals(R(5, 1000), R.from_decimal(Decimal("5e-3")))
+ self.assertEquals(R(5000), R.from_decimal(Decimal("5e3")))
+ self.assertEquals(1 - R(1, 10**30),
+ R.from_decimal(Decimal("0." + "9" * 30)))
+
+ self.assertRaisesMessage(
+ TypeError, "Cannot convert Infinity to Rational.",
+ R.from_decimal, Decimal("inf"))
+ self.assertRaisesMessage(
+ TypeError, "Cannot convert -Infinity to Rational.",
+ R.from_decimal, Decimal("-inf"))
+ self.assertRaisesMessage(
+ TypeError, "Cannot convert NaN to Rational.",
+ R.from_decimal, Decimal("nan"))
+ self.assertRaisesMessage(
+ TypeError, "Cannot convert sNaN to Rational.",
+ R.from_decimal, Decimal("snan"))
+
def testConversions(self):
self.assertTypedEquals(-1, trunc(R(-11, 10)))
self.assertTypedEquals(-2, math.floor(R(-11, 10)))
@@ -175,7 +238,7 @@
self.assertTypedEquals(1.0 + 0j, (1.0 + 0j) ** R(1, 10))
def testMixingWithDecimal(self):
- """Decimal refuses mixed comparisons."""
+ # Decimal refuses mixed comparisons.
self.assertRaisesMessage(
TypeError,
"unsupported operand type(s) for +: 'Rational' and 'Decimal'",
@@ -238,8 +301,8 @@
self.assertFalse(R(5, 2) == 2)
def testStringification(self):
- self.assertEquals("rational.Rational(7,3)", repr(R(7, 3)))
- self.assertEquals("(7/3)", str(R(7, 3)))
+ self.assertEquals("Rational(7,3)", repr(R(7, 3)))
+ self.assertEquals("7/3", str(R(7, 3)))
self.assertEquals("7", str(R(7, 1)))
def testHash(self):