Manually merge r68095,68186,68187,68188,68190 from 2.6 branch.
diff --git a/Lib/fractions.py b/Lib/fractions.py
index 4adb184..446ad8e 100755
--- a/Lib/fractions.py
+++ b/Lib/fractions.py
@@ -111,7 +111,7 @@
 
         """
         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__))