]> granicus.if.org Git - python/commitdiff
Issue #16402: Merge fix from 3.3
authorMark Dickinson <mdickinson@enthought.com>
Sun, 4 Nov 2012 11:47:47 +0000 (11:47 +0000)
committerMark Dickinson <mdickinson@enthought.com>
Sun, 4 Nov 2012 11:47:47 +0000 (11:47 +0000)
1  2 
Lib/test/test_range.py
Misc/NEWS

index f18046dde87b0533fc1588ff476ee19dda5fd327,2a13bfeabd0cc1f2c7bf2176f6d7064581c6b874..f088387c33e2194a0c822e56dba60c2b2bfd1916
@@@ -312,6 -312,15 +312,15 @@@ class RangeTest(unittest.TestCase)
  
          self.assertRaises(TypeError, range, IN())
  
 -        self.assertEqual(list(range(10)[:I(5)]), list(range(5)))
+         # Test use of user-defined classes in slice indices.
++        self.assertEqual(range(10)[:I(5)], range(5))
+         with self.assertRaises(RuntimeError):
+             range(0, 10)[:IX()]
+         with self.assertRaises(TypeError):
+             range(0, 10)[:IN()]
      def test_count(self):
          self.assertEqual(range(3).count(-1), 0)
          self.assertEqual(range(3).count(0), 1)
diff --cc Misc/NEWS
Simple merge