Commit 93f5cd42 authored by Victor Stinner's avatar Victor Stinner

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
........
parent 33d6e97a
...@@ -67,7 +67,11 @@ USER_BASE = None ...@@ -67,7 +67,11 @@ USER_BASE = None
def makepath(*paths): 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) return dir, os.path.normcase(dir)
...@@ -78,8 +82,8 @@ def abs__file__(): ...@@ -78,8 +82,8 @@ def abs__file__():
continue # don't mess with a PEP 302-supplied __file__ continue # don't mess with a PEP 302-supplied __file__
try: try:
m.__file__ = os.path.abspath(m.__file__) m.__file__ = os.path.abspath(m.__file__)
except AttributeError: except (AttributeError, OSError):
continue pass
def removeduppaths(): def removeduppaths():
......
...@@ -414,6 +414,7 @@ Vivek Khera ...@@ -414,6 +414,7 @@ Vivek Khera
Akira Kitada Akira Kitada
Mads Kiilerich Mads Kiilerich
Taek Joo Kim Taek Joo Kim
W. Trevor King
Paul Kippes Paul Kippes
Steve Kirsch Steve Kirsch
Sebastian Kirsche Sebastian Kirsche
......
...@@ -122,6 +122,9 @@ C-API ...@@ -122,6 +122,9 @@ C-API
Library 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 - Issue #9759: GzipFile now raises ValueError when an operation is attempted
after the file is closed. Patch by Jeffrey Finkelstein. after the file is closed. Patch by Jeffrey Finkelstein.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment