summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-05-17 20:09:42 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-05-17 20:09:42 (GMT)
commitc6d64ec83fd6bb170725a04409d8383a53559c95 (patch)
tree5c5432c54cebcaf1da38b605be01585767f68ddf /Lib
parentd7943cb71d51bbf0e2ac715b08b8da2208d2800c (diff)
downloadcpython-c6d64ec83fd6bb170725a04409d8383a53559c95.zip
cpython-c6d64ec83fd6bb170725a04409d8383a53559c95.tar.gz
cpython-c6d64ec83fd6bb170725a04409d8383a53559c95.tar.bz2
revert 63425 over Guido's Febuary message about this, that I missed
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_builtin.py4
-rw-r--r--Lib/test/test_py3kwarn.py14
2 files changed, 0 insertions, 18 deletions
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index 4264a99..15d80a3 100644
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -632,10 +632,6 @@ class BuiltinTest(unittest.TestCase):
self.assertEqual(hex(-16L), '-0x10L')
self.assertRaises(TypeError, hex, {})
- class Spam(object):
- def __index__(self): return 23
- self.assertEqual(hex(Spam()), "0x17")
-
def test_id(self):
id(None)
id(1)
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index 07d5b34..2c8f509 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -123,20 +123,6 @@ class TestPy3KWarnings(unittest.TestCase):
with catch_warning() as w:
self.assertWarning(buffer('a'), w, expected)
- def test_hex_and_oct(self):
- class Spam(object):
- def __hex__(self): return "0x17"
- def __oct__(self): return "07"
-
- expected = 'In 3.x, oct() converts the result of __index__ to octal; ' \
- 'Use future_builtins.oct for this behavior. ' \
- 'Also, note the returned format is different.'
- with catch_warning() as w:
- self.assertWarning(oct(Spam()), w, expected)
- expected = 'In 3.x, hex() converts the result of __index__ to hexadecimal.'
- with catch_warning() as w:
- self.assertWarning(hex(Spam()), w, expected)
-
class TestStdlibRemovals(unittest.TestCase):