mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 14:15:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Manually merge r68095,68186,68187,68188,68190 from 2.6 branch.

Browse source
This commit is contained in:
Georg Brandl 2009-01-03 22:03:11 +00:00
parent c63785db86
commit fe427895b5
5 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/fractions.py
View file

@ -111,7 +111,7 @@ class Fraction(Rational):
"""
if isinstance(f, numbers.Integral):
f = float(f)
return cls(f)
elif not isinstance(f, float):
raise TypeError("%s.from_float() only takes floats, not %r (%s)" %
(cls.__name__, f, type(f).__name__))