Merge lp:~diegosarmentero/ubuntuone-client/udf-issue into lp:ubuntuone-client

[Diego Sarmentero]

Fixed: Problem trying to create an udf with unicode username (LP: #921703 ).

[lp:~diegosarmentero/ubuntuone-client/udf-issue]

1183. By Diego Sarmentero on 2012-01-25

Adding missing docstring

1184. By Diego Sarmentero on 2012-01-25

Fixed unicode automatic promotion

[Brian Curtin (brian.curtin)]

+1

review: Approve

[Natalia Bidart (nataliabidart)]

Looks and works great!

review: Approve

=== modified file 'tests/syncdaemon/test_vm_helper.py'
--- tests/syncdaemon/test_vm_helper.py	2012-01-04 13:18:50 +0000
+++ tests/syncdaemon/test_vm_helper.py	2012-01-25 21:09:23 +0000
@@ -66,6 +66,21 @@
         in_home = os.path.join(self.home_dir, 'foo')
         self.assertEqual(u'~/foo', get_udf_suggested_path(in_home))
 
+    def test_get_udf_suggested_path_expand_user_decode(self):
+        """Test for get_udf_suggested_path."""
+        home = os.path.join(self.home_dir.decode('utf-8'),
+            u'雄鳥お人好し ñandú')
+
+        def fake_expand_user(path):
+            """Fake expand_user."""
+            return home.encode('utf-8')
+
+        self.patch(vm_helper, 'expand_user', fake_expand_user)
+        in_home = os.path.join(home, u'ñoño')
+        in_home = in_home.encode('utf-8')
+        suggested_path = get_udf_suggested_path(in_home)
+        self.assertEqual(u'~/ñoño', suggested_path)
+
     def test_get_udf_suggested_path_long_path(self):
         """Test for get_udf_suggested_path."""
         deep_in_home = os.path.join(self.home_dir, 'docs', 'foo', 'bar')

=== modified file 'ubuntuone/platform/__init__.py'
--- ubuntuone/platform/__init__.py	2011-12-08 20:56:10 +0000
+++ ubuntuone/platform/__init__.py	2012-01-25 21:09:23 +0000
@@ -37,7 +37,6 @@
 
 def expand_user(path):
     """Fix Python expanduser for weird chars in windows."""
-    # Receives bytes, returns unicode
     assert isinstance(path, str)
     try:
         path.decode('utf-8')

=== modified file 'ubuntuone/syncdaemon/vm_helper.py'
--- ubuntuone/syncdaemon/vm_helper.py	2011-11-17 18:38:41 +0000
+++ ubuntuone/syncdaemon/vm_helper.py	2012-01-25 21:09:23 +0000
@@ -89,12 +89,11 @@
     """
     if not path:
         raise ValueError("no path specified")
-
     assert isinstance(path, str)
 
     path = path.decode('utf8')
 
-    user_home = expand_user('~')
+    user_home = expand_user('~').decode('utf-8')
     start_list = os.path.abspath(user_home).split(os.path.sep)
     path_list = os.path.abspath(path).split(os.path.sep)