[Jython-checkins] SF.net SVN: jython: [4944] branches/asm/Lib/site.py

[<nr...@us...>]

Revision: 4944
          http://jython.svn.sourceforge.net/jython/?rev=4944&view=rev
Author:   nriley
Date:     2008-07-15 11:42:08 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
fix for startup problem on Windows - AttributeError was accidentally trapping posixpath abspath failure

Modified Paths:
--------------
    branches/asm/Lib/site.py

Modified: branches/asm/Lib/site.py
===================================================================
--- branches/asm/Lib/site.py	2008-07-15 18:33:40 UTC (rev 4943)
+++ branches/asm/Lib/site.py	2008-07-15 18:42:08 UTC (rev 4944)
@@ -72,12 +72,10 @@
     for m in sys.modules.values():
         if hasattr(m, '__loader__'):
             continue   # don't mess with a PEP 302-supplied __file__
-        try:
-            #XXX: temp workaround while we figure out why this is None on NT.
-            if m.__file__ != None:
-                m.__file__ = os.path.abspath(m.__file__)
-        except AttributeError:
+        f = getattr(m, '__file__', None)
+        if f is None:
             continue
+        m.__file__ = os.path.abspath(f)
 
 def removeduppaths():
     """ Remove duplicate entries from sys.path along with making them


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.