[Python-checkins] r75671 - in python/trunk/Lib/distutils: command/build_py.py command/install_lib.py tests/test_build_py.py tests/test_install_lib.py util.py

[tarek.ziade]

Author: tarek.ziade
Date: Sat Oct 24 17:51:30 2009
New Revision: 75671

Log:
fixed warning and error message

Modified:
   python/trunk/Lib/distutils/command/build_py.py
   python/trunk/Lib/distutils/command/install_lib.py
   python/trunk/Lib/distutils/tests/test_build_py.py
   python/trunk/Lib/distutils/tests/test_install_lib.py
   python/trunk/Lib/distutils/util.py

Modified: python/trunk/Lib/distutils/command/build_py.py
==============================================================================
--- python/trunk/Lib/distutils/command/build_py.py	(original)
+++ python/trunk/Lib/distutils/command/build_py.py	Sat Oct 24 17:51:30 2009
@@ -374,7 +374,7 @@
 
     def byte_compile(self, files):
         if sys.dont_write_bytecode:
-            self.warn('byte-compile not supported on this platform, skipping.')
+            self.warn('byte-compiling is disabled, skipping.')
             return
 
         from distutils.util import byte_compile

Modified: python/trunk/Lib/distutils/command/install_lib.py
==============================================================================
--- python/trunk/Lib/distutils/command/install_lib.py	(original)
+++ python/trunk/Lib/distutils/command/install_lib.py	Sat Oct 24 17:51:30 2009
@@ -121,7 +121,7 @@
 
     def byte_compile(self, files):
         if sys.dont_write_bytecode:
-            self.warn('byte-compile not supported on this platform, skipping.')
+            self.warn('byte-compiling is disabled, skipping.')
             return
 
         from distutils.util import byte_compile

Modified: python/trunk/Lib/distutils/tests/test_build_py.py
==============================================================================
--- python/trunk/Lib/distutils/tests/test_build_py.py	(original)
+++ python/trunk/Lib/distutils/tests/test_build_py.py	Sat Oct 24 17:51:30 2009
@@ -103,7 +103,7 @@
         finally:
             sys.dont_write_bytecode = old_dont_write_bytecode
 
-        self.assertTrue('byte-compile not supported ' in self.logs[0][1])
+        self.assertTrue('byte-compiling is disabled' in self.logs[0][1])
 
 def test_suite():
     return unittest.makeSuite(BuildPyTestCase)

Modified: python/trunk/Lib/distutils/tests/test_install_lib.py
==============================================================================
--- python/trunk/Lib/distutils/tests/test_install_lib.py	(original)
+++ python/trunk/Lib/distutils/tests/test_install_lib.py	Sat Oct 24 17:51:30 2009
@@ -92,7 +92,7 @@
         finally:
             sys.dont_write_bytecode = old_dont_write_bytecode
 
-        self.assertTrue('byte-compile not supported ' in self.logs[0][1])
+        self.assertTrue('byte-compiling is disabled' in self.logs[0][1])
 
 def test_suite():
     return unittest.makeSuite(InstallLibTestCase)

Modified: python/trunk/Lib/distutils/util.py
==============================================================================
--- python/trunk/Lib/distutils/util.py	(original)
+++ python/trunk/Lib/distutils/util.py	Sat Oct 24 17:51:30 2009
@@ -448,7 +448,7 @@
     """
     # nothing is done if sys.dont_write_bytecode is True
     if sys.dont_write_bytecode:
-        raise DistutilsByteCompileError('byte-compiling not supported.')
+        raise DistutilsByteCompileError('byte-compiling is disabled.')
 
     # First, if the caller didn't force us into direct or indirect mode,
     # figure out which mode we should be in.  We take a conservative