From: Jesus Cea <jcea@jcea.es>
Date: Thu, 10 May 2012 03:16:41 +0000 (+0200)
Subject: MERGE: Closes #14768: os.path.expanduser('~/a') doesn't works correctly when HOME... 
X-Git-Tag: v3.3.0a4~217
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b58ab2c6aa96a9320de2d4b2966e0e968ce5c524;p=python

MERGE: Closes #14768: os.path.expanduser('~/a') doesn't works correctly when HOME is '/'
---

b58ab2c6aa96a9320de2d4b2966e0e968ce5c524
diff --cc Misc/ACKS
index 6e38038bce,780c06fd5e..c7dc2f4098
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -331,12 -306,10 +331,13 @@@ Michael Foor
  Amaury Forgeot d'Arc
  Doug Fort
  John Fouhy
 +Andrew Francis
  Martin Franklin
 +Bruce Frederiksen
  Robin Friedrich
+ Bradley Froehle
  Ivan Frohne
 +Matthias Fuchs
  Jim Fulton
  Tadayoshi Funaba
  Gyro Funch
diff --cc Misc/NEWS
index 0850336c90,c4901b02a7..9109bf4ac0
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -137,9 -43,34 +137,11 @@@ Core and Builtin
  Library
  -------
  
 -- Issue #14768: os.path.expanduser('~/a') doesn't works correctly when HOME is '/'.
 -
 -- Issue #14741: Fix missing support for Ellipsis ('...') in parser module.
 +- Issue #13815: TarFile.extractfile() now returns io.BufferedReader objects.
  
 -- Issue #14697: Fix missing support for set displays and set comprehensions in
 -  parser module.
++- Issue #14768: os.path.expanduser('~/a') doesn't works correctly when HOME is '/'.
+ 
 -- Issue #14701: Fix missing support for 'raise ... from' in parser module.
 +- Issue #14371: Support bzip2 in zipfile module.  Patch by Serhiy Storchaka.
  
  - Issue #13183: Fix pdb skipping frames after hitting a breakpoint and running
    step.  Patch by Xavier de Gaye.