Merged revisions 85386-85387,85389 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85386 | victor.stinner | 2010-10-13 00:23:23 +0200 (mer., 13 oct. 2010) | 3 lines

  Issue #6612: Fix site and sysconfig to catch os.getcwd() error, eg. if the
  current directory was deleted.
........
  r85387 | victor.stinner | 2010-10-13 00:26:08 +0200 (mer., 13 oct. 2010) | 2 lines

  #6612: add the author of the patch (W. Trevor King)
........
  r85389 | victor.stinner | 2010-10-13 00:42:37 +0200 (mer., 13 oct. 2010) | 2 lines

  NEWS: Move #6612 to Library section
........

diff --git a/Lib/site.py b/Lib/site.py
index 780ea7e162f404ee58f669c5d57db89f2e165dbe..0cc22eba2e579a1b819e1607fdadfd465571f2e7 100644 (file)
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -67,7 +67,11 @@ USER_BASE = None
 
 
 def makepath(*paths):
-    dir = os.path.abspath(os.path.join(*paths))
+    dir = os.path.join(*paths)
+    try:
+        dir = os.path.abspath(dir)
+    except OSError:
+        pass
     return dir, os.path.normcase(dir)
 
 
@@ -78,8 +82,8 @@ def abs__file__():
             continue   # don't mess with a PEP 302-supplied __file__
         try:
             m.__file__ = os.path.abspath(m.__file__)
-        except AttributeError:
-            continue
+        except (AttributeError, OSError):
+            pass
 
 
 def removeduppaths():

diff --git a/Misc/ACKS b/Misc/ACKS
index 95dbb9e49a4c3f727c586af53f382700a5ecb179..ece5f561d07cdefcfdcdc6f7a0369ad526e8b0c2 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -414,6 +414,7 @@ Vivek Khera
 Akira Kitada
 Mads Kiilerich
 Taek Joo Kim
+W. Trevor King
 Paul Kippes
 Steve Kirsch
 Sebastian Kirsche

diff --git a/Misc/NEWS b/Misc/NEWS
index 3b76452938ced58f12560f52ba8762ed64586c07..4f45059847deb2a78586effafa69dfec85646090 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -122,6 +122,9 @@ C-API
 Library
 -------
 
+- Issue #6612: Fix site and sysconfig to catch os.getcwd() error, eg. if the
+  current directory was deleted. Patch written by W. Trevor King.
+
 - Issue #9759: GzipFile now raises ValueError when an operation is attempted
   after the file is closed.  Patch by Jeffrey Finkelstein.
 
@@ -188,7 +191,7 @@ Library
 - Issue #8750: Fixed MutableSet's methods to correctly handle
   reflexive operations, namely x -= x and x ^= x.
 
-- Issue #9129: smtpd.py is vulnerable to DoS attacks deriving from missing 
+- Issue #9129: smtpd.py is vulnerable to DoS attacks deriving from missing
   error handling when accepting a new connection.
 
 - Issue #658749: asyncore's connect() method now correctly interprets winsock
@@ -543,7 +546,7 @@ Extension Modules
 -----------------
 
 - Issue #10003: Allow handling of SIGBREAK on Windows. Fixes a regression
-  introduced by issue #9324. 
+  introduced by issue #9324.
 
 - Issue #8734: Avoid crash in msvcrt.get_osfhandle() when an invalid file
   descriptor is provided.  Patch by Pascal Chambon.