From cda41d92ff2e2642038e5d200632ade709c4e6c4 2015-07-08 14:11:37
From: Sebastiaan Mathot <s.mathot@cogsci.nl>
Date: 2015-07-08 14:11:37
Subject: [PATCH] Safely encode paths in compress_user
- Avoids a `UnicodeDecodeError` when a tooltip that includes a non-ascii pathname is shown on Python 2
- Related to #8543

---

diff --git a/IPython/utils/path.py b/IPython/utils/path.py
index 02ebd25..94b3d95 100644
--- a/IPython/utils/path.py
+++ b/IPython/utils/path.py
@@ -81,7 +81,8 @@ def unquote_filename(name, win32=(sys.platform=='win32')):
 
 def compress_user(path):
     """Reverse of :func:`os.path.expanduser`
-    """
+    """    
+    path = py3compat.unicode_to_str(path, sys.getfilesystemencoding())
     home = os.path.expanduser('~')
     if path.startswith(home):
         path =  "~" + path[len(home):]
@@ -174,13 +175,13 @@ def get_home_dir(require_writable=False):
     """Return the 'home' directory, as a unicode string.
 
     Uses os.path.expanduser('~'), and checks for writability.
-    
+
     See stdlib docs for how this is determined.
     $HOME is first priority on *ALL* platforms.
-    
+
     Parameters
     ----------
-    
+
     require_writable : bool [default: False]
         if True:
             guarantees the return value is a writable directory, otherwise
@@ -193,7 +194,7 @@ def get_home_dir(require_writable=False):
     # Next line will make things work even when /home/ is a symlink to
     # /usr/home as it is on FreeBSD, for example
     homedir = os.path.realpath(homedir)
-    
+
     if not _writable_dir(homedir) and os.name == 'nt':
         # expanduser failed, use the registry to get the 'My Documents' folder.
         try:
@@ -209,7 +210,7 @@ def get_home_dir(require_writable=False):
             key.Close()
         except:
             pass
-    
+
     if (not require_writable) or _writable_dir(homedir):
         return py3compat.cast_unicode(homedir, fs_encoding)
     else:
@@ -430,10 +431,10 @@ def link_or_copy(src, dst):
 
 def ensure_dir_exists(path, mode=0o755):
     """ensure that a directory exists
-    
+
     If it doesn't exist, try to create it and protect against a race condition
     if another process is doing the same.
-    
+
     The default permissions are 755, which differ from os.makedirs default of 777.
     """
     if not os.path.exists(path):