From: Éric Araujo <merwok@netwok.org>
Date: Sun, 18 Sep 2011 18:24:27 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.3.0a1~1524^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc95dd81f32112b31a321d42ac676d6ec714747d;p=thirdparty%2FPython%2Fcpython.git

Branch merge
---

cc95dd81f32112b31a321d42ac676d6ec714747d
diff --cc Lib/packaging/tests/test_command_install_lib.py
index c1066f651214,d36120b871ec..9118e688aee7
--- a/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)