Merge pull request RustPython#3969 from daeun503/fix-range-attribute

Fix range attributes type

Author: youknowone

Lib/test/test_copy.py

@@ -7,6 +7,7 @@
 from operator import le, lt, ge, gt, eq, ne
 
 import unittest
+from test import support
 
 order_comparisons = le, lt, ge, gt
 equality_comparisons = eq, ne
@@ -99,7 +100,7 @@ class WithMetaclass(metaclass=abc.ABCMeta):
                  42, 2**100, 3.14, True, False, 1j,
                  "hello", "hello\u1234", f.__code__,
                  b"world", bytes(range(256)), range(10), slice(1, 10, 2),
-                 NewStyle, Classic, max, WithMetaclass]
+                 NewStyle, Classic, max, WithMetaclass, property()]
         for x in tests:
             self.assertIs(copy.copy(x), x)
 
@@ -350,6 +351,8 @@ def __getattribute__(self, name):
 
     # Type-specific _deepcopy_xxx() methods
 
+    # TODO: RUSTPYTHON
+    @unittest.expectedFailure
     def test_deepcopy_atomic(self):
         class Classic:
             pass
@@ -359,7 +362,7 @@ def f():
             pass
         tests = [None, 42, 2**100, 3.14, True, False, 1j,
                  "hello", "hello\u1234", f.__code__,
-                 NewStyle, Classic, max]
+                 NewStyle, range(10), Classic, max, property()]
         for x in tests:
             self.assertIs(copy.deepcopy(x), x)
 
@@ -583,17 +586,6 @@ class C:
         self.assertIsNot(y, x)
         self.assertIs(y.foo, y)
 
-    def test_deepcopy_range(self):
-        class I(int):
-            pass
-        x = range(I(10))
-        y = copy.deepcopy(x)
-        self.assertIsNot(y, x)
-        self.assertEqual(y, x)
-        self.assertIsNot(y.stop, x.stop)
-        self.assertEqual(y.stop, x.stop)
-        self.assertIsInstance(y.stop, I)
-
     # _reconstruct()
 
     def test_reconstruct_string(self):
@@ -820,6 +812,7 @@ class C(object):
         self.assertEqual(v[c], d)
         self.assertEqual(len(v), 2)
         del c, d
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(v), 1)
         x, y = C(), C()
         # The underlying containers are decoupled
@@ -849,6 +842,7 @@ def __init__(self, i):
         self.assertEqual(v[a].i, b.i)
         self.assertEqual(v[c].i, d.i)
         del c
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(v), 1)
 
     def test_deepcopy_weakvaluedict(self):
@@ -872,6 +866,7 @@ def __init__(self, i):
         self.assertIs(t, d)
         del x, y, z, t
         del d
+        support.gc_collect()  # For PyPy or other GCs.
         self.assertEqual(len(v), 1)
 
     def test_deepcopy_bound_method(self):

Lib/test/test_range.py

@@ -661,9 +661,6 @@ def test_comparison(self):
         with self.assertRaises(TypeError):
             range(0) >= range(0)
 
-
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_attributes(self):
         # test the start, stop and step attributes of range objects
         self.assert_attrs(range(0), 0, 0, 1)

vm/src/builtins/range.rs

@@ -181,27 +181,32 @@ pub fn init(context: &Context) {
 
 #[pyimpl(with(AsMapping, AsSequence, Hashable, Comparable, Iterable))]
 impl PyRange {
-    fn new(cls: PyTypeRef, stop: PyIntRef, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {
+    fn new(cls: PyTypeRef, stop: PyObjectRef, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {
         PyRange {
             start: vm.new_pyref(0),
-            stop,
+            stop: stop.try_index(vm)?,
             step: vm.new_pyref(1),
         }
         .into_ref_with_type(vm, cls)
     }
 
     fn new_from(
         cls: PyTypeRef,
-        start: PyIntRef,
-        stop: PyIntRef,
-        step: OptionalArg<PyIntRef>,
+        start: PyObjectRef,
+        stop: PyObjectRef,
+        step: OptionalArg<PyObjectRef>,
         vm: &VirtualMachine,
     ) -> PyResult<PyRef<Self>> {
-        let step = step.unwrap_or_else(|| vm.new_pyref(1));
+        let step = step.unwrap_or_else(|| vm.new_pyobj(1)).try_index(vm)?;
         if step.as_bigint().is_zero() {
             return Err(vm.new_value_error("range() arg 3 must not be zero".to_owned()));
         }
-        PyRange { start, stop, step }.into_ref_with_type(vm, cls)
+        PyRange {
+            start: start.try_index(vm)?,
+            stop: stop.try_index(vm)?,
+            step,
+        }
+        .into_ref_with_type(vm, cls)
     }
 
     #[pyproperty]