[Python-checkins] r69883 - in python/branches/py3k: Lib/distutils/cmd.py Lib/distutils/dist.py

[tarek.ziade]

Author: tarek.ziade
Date: Sun Feb 22 21:20:59 2009
New Revision: 69883

Log:
Merged revisions 69881 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69881 | tarek.ziade | 2009-02-22 21:15:41 +0100 (Sun, 22 Feb 2009) | 1 line
  
  Removing unused __main__ sections
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/distutils/cmd.py
   python/branches/py3k/Lib/distutils/dist.py

Modified: python/branches/py3k/Lib/distutils/cmd.py
==============================================================================
--- python/branches/py3k/Lib/distutils/cmd.py	(original)
+++ python/branches/py3k/Lib/distutils/cmd.py	Sun Feb 22 21:20:59 2009
@@ -436,7 +436,3 @@
 
     def get_outputs (self):
         return self.outfiles
-
-
-if __name__ == "__main__":
-    print("ok")

Modified: python/branches/py3k/Lib/distutils/dist.py
==============================================================================
--- python/branches/py3k/Lib/distutils/dist.py	(original)
+++ python/branches/py3k/Lib/distutils/dist.py	Sun Feb 22 21:20:59 2009
@@ -1180,8 +1180,3 @@
     for help_tuple in options:
         new_options.append(help_tuple[0:3])
     return new_options
-
-
-if __name__ == "__main__":
-    dist = Distribution()
-    print("ok")