[pypy-commit] pypy stdlib-2.7.6: kill some more stdlib modifications no longer needed

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: stdlib-2.7.6
Changeset: r69663:58c31b45df71
Date: 2014-03-04 02:59 -0500
http://bitbucket.org/pypy/pypy/changeset/58c31b45df71/

Log:	kill some more stdlib modifications no longer needed

diff --git a/lib-python/2.7/test/test_code.py b/lib-python/2.7/test/test_code.py
--- a/lib-python/2.7/test/test_code.py
+++ b/lib-python/2.7/test/test_code.py
@@ -82,6 +82,7 @@
 
 import unittest
 import weakref
+import _testcapi
 from test import test_support
 
 
@@ -104,9 +105,7 @@
 
 class CodeTest(unittest.TestCase):
 
-    @test_support.impl_detail("test for PyCode_NewEmpty")
     def test_newempty(self):
-        import _testcapi
         co = _testcapi.code_newempty("filename", "funcname", 15)
         self.assertEqual(co.co_filename, "filename")
         self.assertEqual(co.co_name, "funcname")
diff --git a/lib-python/2.7/test/test_support.py b/lib-python/2.7/test/test_support.py
--- a/lib-python/2.7/test/test_support.py
+++ b/lib-python/2.7/test/test_support.py
@@ -19,12 +19,9 @@
 import re
 import time
 import struct
+import _testcapi
 import sysconfig
 try:
-    import _testcapi
-except ImportError:
-    _testcapi = None
-try:
     import thread
 except ImportError:
     thread = None
@@ -975,7 +972,7 @@
     # add GC header size
     if ((type(o) == type) and (o.__flags__ & _TPFLAGS_HEAPTYPE) or\
         ((type(o) != type) and (type(o).__flags__ & _TPFLAGS_HAVE_GC))):
-        size += 1 if _testcapi is None else _testcapi.SIZEOF_PYGC_HEAD
+        size += _testcapi.SIZEOF_PYGC_HEAD
     msg = 'wrong size for %s: got %d, expected %d' \
             % (type(o), result, size)
     test.assertEqual(result, size, msg)
diff --git a/lib-python/2.7/test/test_traceback.py b/lib-python/2.7/test/test_traceback.py
--- a/lib-python/2.7/test/test_traceback.py
+++ b/lib-python/2.7/test/test_traceback.py
@@ -1,9 +1,6 @@
 """Test cases for traceback module"""
 
-try:
-    from _testcapi import traceback_print
-except ImportError:
-    traceback_print = None
+from _testcapi import traceback_print
 from StringIO import StringIO
 import sys
 import unittest
@@ -179,8 +176,6 @@
 class TracebackFormatTests(unittest.TestCase):
 
     def test_traceback_format(self):
-        if traceback_print is None:
-            raise unittest.SkipTest('Requires _testcapi')
         try:
             raise KeyError('blah')
         except KeyError:
diff --git a/lib-python/2.7/test/test_unicode.py b/lib-python/2.7/test/test_unicode.py
--- a/lib-python/2.7/test/test_unicode.py
+++ b/lib-python/2.7/test/test_unicode.py
@@ -1636,10 +1636,7 @@
         self.assertEqual("{}".format(u), '__unicode__ overridden')
 
     def test_encode_decimal(self):
-        try:
-            from _testcapi import unicode_encodedecimal
-        except ImportError:
-            raise unittest.SkipTest('Requires _testcapi')
+        from _testcapi import unicode_encodedecimal
         self.assertEqual(unicode_encodedecimal(u'123'),
                          b'123')
         self.assertEqual(unicode_encodedecimal(u'\u0663.\u0661\u0664'),