Index: Objects/rangeobject.c
===================================================================
--- Objects/rangeobject.c	(revision 62497)
+++ Objects/rangeobject.c	(working copy)
@@ -14,6 +14,7 @@
     PyObject *start;
     PyObject *stop;
     PyObject *step;
+    Py_ssize_t length;
 } rangeobject;
 
 /* Helper function for validating step.  Always returns a new reference or
@@ -43,6 +44,9 @@
     return step;
 }
 
+static Py_ssize_t range_compute_length(PyObject *start,
+				       PyObject *stop, PyObject *step);
+
 /* XXX(nnorwitz): should we error check if the user passes any empty ranges?
    range(-10)
    range(0, -5)
@@ -53,6 +57,7 @@
 {
     rangeobject *obj = NULL;
     PyObject *start = NULL, *stop = NULL, *step = NULL;
+    Py_ssize_t length;
 
     if (!_PyArg_NoKeywords("range()", kw))
         return NULL;
@@ -81,12 +86,16 @@
             goto Fail;
     }
 
+    length = range_compute_length(start, stop, step);
+    if (length < 0)
+	goto Fail;
     obj = PyObject_New(rangeobject, &PyRange_Type);
     if (obj == NULL)
         goto Fail;
     obj->start = start;
     obj->stop = stop;
     obj->step = step;
+    obj->length = length;
     return (PyObject *) obj;
 
 Fail:
@@ -116,16 +125,16 @@
  * Arguments MUST return 1 with either PyLong_Check() or
  * PyLong_Check().  Return -1 when there is an error.
  */
-static PyObject*
-range_length_obj(rangeobject *r)
+static Py_ssize_t
+range_compute_length(PyObject *start, PyObject *stop, PyObject *step)
 {
     /* -------------------------------------------------------------
     Algorithm is equal to that of get_len_of_range(), but it operates
     on PyObjects (which are assumed to be PyLong or PyInt objects).
     ---------------------------------------------------------------*/
+    Py_ssize_t length;
     int cmp_result, cmp_call;
     PyObject *lo, *hi;
-    PyObject *step = NULL;
     PyObject *diff = NULL;
     PyObject *one = NULL;
     PyObject *tmp1 = NULL, *tmp2 = NULL, *result;
@@ -133,30 +142,29 @@
 
     PyObject *zero = PyLong_FromLong(0);
     if (zero == NULL)
-        return NULL;
-    cmp_call = PyObject_Cmp(r->step, zero, &cmp_result);
+        return -1;
+    cmp_call = PyObject_Cmp(step, zero, &cmp_result);
     Py_DECREF(zero);
     if (cmp_call == -1)
-        return NULL;
+        return -1;
 
     assert(cmp_result != 0);
     if (cmp_result > 0) {
-        lo = r->start;
-        hi = r->stop;
-        step = r->step;
+        lo = start;
+        hi = stop;
         Py_INCREF(step);
     } else {
-        lo = r->stop;
-        hi = r->start;
-        step = PyNumber_Negative(r->step);
+        lo = stop;
+        hi = start;
+        step = PyNumber_Negative(step);
         if (!step)
-            return NULL;
+            return -1;
     }
 
     /* if (lo >= hi), return length of 0. */
     if (PyObject_Compare(lo, hi) >= 0) {
         Py_XDECREF(step);
-        return PyLong_FromLong(0);
+        return 0;
     }
 
     if ((one = PyLong_FromLong(1L)) == NULL)
@@ -179,7 +187,12 @@
     Py_DECREF(step);
     Py_DECREF(tmp1);
     Py_DECREF(one);
-    return result;
+    length = PyLong_AsSsize_t(result);
+    if (length == -1 && PyErr_ExceptionMatches(PyExc_OverflowError))
+	PyErr_SetString(PyExc_OverflowError, 
+			"range length exceded sys.maxsize");
+    Py_DECREF(result);
+    return length;
 
   Fail:
     Py_XDECREF(tmp2);
@@ -187,19 +200,13 @@
     Py_XDECREF(step);
     Py_XDECREF(tmp1);
     Py_XDECREF(one);
-    return NULL;
+    return -1;
 }
 
 static Py_ssize_t
 range_length(rangeobject *r)
 {
-    PyObject *len = range_length_obj(r);
-    Py_ssize_t result = -1;
-    if (len) {
-        result = PyLong_AsSsize_t(len);
-        Py_DECREF(len);
-    }
-    return result;
+    return r->length;
 }
 
 /* range(...)[x] is necessary for:  seq[:] = range(...) */
@@ -216,8 +223,8 @@
         if (!PyErr_Occurred())
             PyErr_SetString(PyExc_IndexError,
                             "range object index out of range");
-            return NULL;
-        }
+	return NULL;
+    }
 
     /* XXX(nnorwitz): optimize for short ints. */
     rem = PyLong_FromSsize_t(i);
@@ -647,7 +654,7 @@
         return NULL;
 
     /* start + (len - 1) * step */
-    len = range_length_obj(range);
+    len = PyLong_FromSsize_t(range->length);
     if (!len)
         goto create_failure;
 
Index: Lib/test/test_builtin.py
===================================================================
--- Lib/test/test_builtin.py	(revision 62497)
+++ Lib/test/test_builtin.py	(working copy)
@@ -1590,10 +1590,10 @@
         self.assertRaises(TypeError, range, 0, "spam")
         self.assertRaises(TypeError, range, 0, 42, "spam")
 
-        #NEAL self.assertRaises(OverflowError, range, -sys.maxsize, sys.maxsize)
-        #NEAL self.assertRaises(OverflowError, range, 0, 2*sys.maxsize)
+        self.assertRaises(OverflowError, range, -sys.maxsize, sys.maxsize)
+        self.assertRaises(OverflowError, range, 0, 2*sys.maxsize)
 
-        self.assertRaises(OverflowError, len, range(0, sys.maxsize**10))
+        # self.assertRaises(OverflowError, len, range(0, sys.maxsize**10))
 
     def test_input(self):
         self.write_testfile()