[Checkins] SVN: grokcore.startup/trunk/ re-commit a fix that somehow never made in the 1.0.1 release

[Jan-Wijbrand Kolman]

Log message for revision 117236:
  re-commit a fix that somehow never made in the 1.0.1 release

Changed:
  U   grokcore.startup/trunk/CHANGES.txt
  U   grokcore.startup/trunk/src/grokcore/startup/README.txt
  U   grokcore.startup/trunk/src/grokcore/startup/startup.py

-=-
Modified: grokcore.startup/trunk/CHANGES.txt
===================================================================
--- grokcore.startup/trunk/CHANGES.txt	2010-10-05 06:59:09 UTC (rev 117235)
+++ grokcore.startup/trunk/CHANGES.txt	2010-10-05 08:36:33 UTC (rev 117236)
@@ -4,9 +4,9 @@
 1.0.2 (unreleased)
 ==================
 
-- Nothing changed yet.
+- Somehow the intended fix in 1.0.1 did not actually get included in that
+  release. We make the fix again.
 
-
 1.0.1 (2010-08-18)
 ==================
 

Modified: grokcore.startup/trunk/src/grokcore/startup/README.txt
===================================================================
--- grokcore.startup/trunk/src/grokcore/startup/README.txt	2010-10-05 06:59:09 UTC (rev 117235)
+++ grokcore.startup/trunk/src/grokcore/startup/README.txt	2010-10-05 08:36:33 UTC (rev 117236)
@@ -329,7 +329,7 @@
     <zope.site.folder.Folder object at ...>
     ['...script.py']
     '...script.py'
-    '__builtin__'
+    '__main__'
 
   Clean up the temp_dir
 

Modified: grokcore.startup/trunk/src/grokcore/startup/startup.py
===================================================================
--- grokcore.startup/trunk/src/grokcore/startup/startup.py	2010-10-05 06:59:09 UTC (rev 117235)
+++ grokcore.startup/trunk/src/grokcore/startup/startup.py	2010-10-05 08:36:33 UTC (rev 117236)
@@ -53,6 +53,7 @@
         # to run is the first argument.
         del sys.argv[0]
 
+        globals_['__name__'] = '__main__'
         globals_['__file__'] = sys.argv[0]
         execfile(sys.argv[0], globals_)
         sys.exit()