Merge tests from 3.5

diff --cc Lib/test/test_sysconfig.py
index 355bc614da35ac4325560996f1f1001b13315996,38306790e42f5b8adaad89e332c277fccc4bff0e..a29ca96d1fc4b2211b8335d796ebeef0bd53d0f3
--- 1/Lib/test/test_sysconfig.py
--- 2/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@@ -385,11 -386,10 +386,12 @@@ class TestSysConfig(unittest.TestCase)
          self.assertIsNotNone(vars['SO'])
          self.assertEqual(vars['SO'], vars['EXT_SUFFIX'])
  
 -    @unittest.skipUnless(sys.platform == 'linux', 'Linux-specific test')
 +    @unittest.skipUnless(sys.platform == 'linux' and
 +                         hasattr(sys.implementation, '_multiarch'),
 +                         'multiarch-specific test')
      def test_triplet_in_ext_suffix(self):
-         import ctypes, platform, re
+         ctypes = import_module('ctypes')
+         import platform, re
          machine = platform.machine()
          suffix = sysconfig.get_config_var('EXT_SUFFIX')
          if re.match('(aarch64|arm|mips|ppc|powerpc|s390|sparc)', machine):

diff --cc Lib/test/test_unicode.py
Simple merge