Branch merge

diff --cc Lib/packaging/tests/test_command_build_ext.py
Simple merge

diff --cc Lib/packaging/tests/test_command_install_lib.py
index c1066f65121459032805b441b6b684c5cfebea59,d36120b871ec0bbdc7f556bdb5876a94299f7b86..9118e688aee71df93bed0a1b9ea7f6573d7ce745
--- 1/Lib/packaging/tests/test_command_install_lib.py
--- 2/Lib/packaging/tests/test_command_install_lib.py
+++ b/Lib/packaging/tests/test_command_install_lib.py
@@@ -40,7 -33,7 +33,7 @@@ class InstallLibTestCase(support.Tempdi
          cmd.finalize_options()
          self.assertEqual(cmd.optimize, 2)
  
-     @unittest.skipIf(no_bytecode, 'byte-compile disabled')
 -    @unittest.skipIf(sys.dont_write_bytecode, 'byte-compile not supported')
++    @unittest.skipIf(sys.dont_write_bytecode, 'byte-compile disabled')
      def test_byte_compile(self):
          pkg_dir, dist = self.create_dist()
          cmd = install_lib(dist)

diff --cc Lib/packaging/tests/test_util.py
Simple merge