Merge lp:~alecu/ubuntuone-client/unicode-usernames into lp:ubuntuone-client

[Alejandro J. Cura]

Support for unicode usernames (LP: #846373)

Support for unicode usernames (LP: #846373)
This branch *REQUIRES* this other branch: lp:~alecu/ubuntu-sso-client/unicode-usernames

[Roberto Alsina (ralsina)]

+1

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~alecu/ubuntuone-client/unicode-usernames into lp:ubuntuone-client failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.17
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-gtk-doc --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to ...

[Alejandro J. Cura (alecu)]

It seems like tarmac is not picking up the changes from sso, but instead it's using the sso packaged in nightlies.

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~alecu/ubuntuone-client/unicode-usernames into lp:ubuntuone-client failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.17
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-gtk-doc --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to ...

[Alejandro J. Cura (alecu)]

Let's try once more.

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~alecu/ubuntuone-client/unicode-usernames into lp:ubuntuone-client failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.17
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-gtk-doc --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to ...

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~alecu/ubuntuone-client/unicode-usernames into lp:ubuntuone-client failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.17
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-gtk-doc --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to ...

[lp:~alecu/ubuntuone-client/unicode-usernames]

1139. By Alejandro J. Cura on 2011-09-28

merged trunk in

1140. By Alejandro J. Cura on 2011-10-03

skip Unicode tests on linux

1141. By Alejandro J. Cura on 2011-10-03

merged with trunk

[Alejandro J. Cura (alecu)]

Since paths and environment variables are always "bytes" on linux, we've decided to only run the tests for this fixes on windows.

=== modified file 'tests/platform/test_filesystem_notifications.py'
--- tests/platform/test_filesystem_notifications.py	2011-08-25 18:27:25 +0000
+++ tests/platform/test_filesystem_notifications.py	2011-10-03 14:06:49 +0000
@@ -20,9 +20,9 @@
 
 import logging
 import os
-import unittest
 
 from twisted.internet import defer, reactor
+from twisted.trial import unittest
 from ubuntuone.devtools.handlers import MementoHandler
 
 from tests.platform import _GeneralINotifyProcessor
@@ -36,6 +36,7 @@
 from ubuntuone.syncdaemon import (
     event_queue,
     filesystem_manager,
+    filesystem_notifications,
 )
 
 class IgnoreFileTests(unittest.TestCase):
@@ -72,6 +73,17 @@
         self.assertFalse(p.is_ignored("--foo--"))
         self.assertFalse(p.is_ignored("otherstuff"))
 
+    def test_is_ignored_uses_access(self):
+        """Test that the right access function is called."""
+        sample_path = "sample path"
+        calls = []
+        store_call = lambda *args: calls.append(args)
+        self.patch(filesystem_notifications, "access", store_call)
+        self.patch(filesystem_notifications, "path_exists", lambda _: True)
+        p = _GeneralINotifyProcessor(None)
+        p.is_ignored(sample_path)
+        self.assertEqual(calls, [(sample_path,)])
+
 
 class BaseFSMonitorTestCase(BaseTwistedTestCase):
     """Test the structures where we have the path/watch."""

=== modified file 'tests/syncdaemon/test_config.py'
--- tests/syncdaemon/test_config.py	2011-08-24 16:24:01 +0000
+++ tests/syncdaemon/test_config.py	2011-10-03 14:06:49 +0000
@@ -1,4 +1,5 @@
-#
+# encoding: utf-8
+
 # Author: Guillermo Gonzalez <[e-mail]>
 #
 # Copyright 2009 Canonical Ltd.
@@ -19,10 +20,13 @@
 
 import logging
 import os
+import sys
 
 from ConfigParser import ConfigParser
 from twisted.internet import defer
+from twisted.trial.unittest import TestCase
 
+from ubuntuone.devtools.testcase import skipIfOS
 from ubuntuone.platform import open_file, path_exists
 from ubuntu_sso.xdg_base_directory import (
     xdg_data_home,
@@ -471,6 +475,25 @@
         self.assertEqual(conf.get_max_payload_size(), 666)
 
 
+class UnicodePathsTestCase(TestCase):
+    """Tests for unicode paths."""
+
+    @skipIfOS('linux2', 'On linux paths are bytes so this test does not apply')
+    def test_get_config_files_path_encoding(self):
+        """Check that get_config_files uses paths in the right encoding."""
+        temp = self.mktemp()
+        fake_path = os.path.join(temp, u"Ñandú")
+        native_dir = fake_path.encode(sys.getfilesystemencoding())
+        os.makedirs(native_dir)
+        with open(os.path.join(native_dir, config.CONFIG_FILE), "w") as f:
+            f.write("this is a fake config file")
+        fake_load_config_paths = lambda _: [fake_path.encode("utf8")]
+        self.patch(config, "load_config_paths", fake_load_config_paths)
+        config_files = config.get_config_files()
+        branch_config = os.path.join(native_dir, config.CONFIG_FILE)
+        self.assertIn(branch_config, config_files)
+
+
 class ConfigglueParsersTests(BaseTwistedTestCase):
     """Tests for our custom configglue parsers."""
 

=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2011-09-06 17:13:11 +0000
+++ tests/syncdaemon/test_vm.py	2011-10-03 14:06:49 +0000
@@ -25,6 +25,7 @@
 import inspect
 import logging
 import os
+import sys
 import uuid
 
 from mocker import Mocker, MATCH
@@ -35,6 +36,7 @@
     FakeMain,
 )
 from ubuntuone.devtools.handlers import MementoHandler
+from ubuntuone.devtools.testcase import skipIfOS
 from ubuntuone.storageprotocol import volumes, request
 from ubuntuone.storageprotocol.client import ListShares
 from ubuntuone.storageprotocol.sharersp import (
@@ -3887,6 +3889,39 @@
             self.md_upgrader._upgrade_metadata_5(6)
 
 
+@skipIfOS('linux2', 'On linux paths are bytes so this tests do not apply')
+class MetadataVersionFileTestCase(MetadataTestCase):
+    """Check that the metadata version file can have unicode characters."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Initialize this testcase."""
+        yield super(MetadataVersionFileTestCase, self).setUp()
+        self.fake_version = "FAKE"
+        self.patch(VolumeManager, "METADATA_VERSION", self.fake_version)
+        self.temp_dir = os.path.join(self.mktemp(), u"Ñandú")
+        self.version_file = os.path.join(self.temp_dir, ".version").encode(
+                                                 sys.getfilesystemencoding())
+        self.md_upgrader = MetadataUpgrader(self.temp_dir.encode("utf-8"),
+                                            "", "", "", "", "", "", None)
+
+    def test_metadata_version_write(self):
+        """The metadata .version file is written on unicode paths."""
+        self.md_upgrader.update_metadata_version()
+
+        with open(self.version_file) as fh:
+            result = fh.read().strip()
+        self.assertEqual(result, self.fake_version)
+
+    def test_metadata_version_read(self):
+        """The metadata .version file is read from unicode paths."""
+        with open(self.version_file, "w") as fh:
+            fh.write(self.fake_version)
+
+        result = self.md_upgrader._get_md_version()
+        self.assertEqual(result, self.fake_version)
+
+
 class VMTritcaskShelfTests(BaseTwistedTestCase):
     """Tests for VMTritcaskShelf."""
 

=== modified file 'ubuntuone/platform/linux/__init__.py'
--- ubuntuone/platform/linux/__init__.py	2011-08-17 12:43:42 +0000
+++ ubuntuone/platform/linux/__init__.py	2011-10-03 14:06:49 +0000
@@ -37,6 +37,7 @@
     make_dir,
     make_link,
     move_to_trash,
+    native_rename,
     normpath,
     open_file,
     path_exists,

=== modified file 'ubuntuone/platform/linux/os_helper.py'
--- ubuntuone/platform/linux/os_helper.py	2011-08-22 13:31:56 +0000
+++ ubuntuone/platform/linux/os_helper.py	2011-10-03 14:06:49 +0000
@@ -115,6 +115,11 @@
     os.rename(path_from, path_to)
 
 
+def native_rename(path_from, path_to):
+    """Rename a file or directory."""
+    os.rename(path_from, path_to)
+
+
 def recursive_move(path_from, path_to):
     """Perform a recursive move."""
     shutil.move(path_from, path_to)

=== modified file 'ubuntuone/platform/windows/__init__.py'
--- ubuntuone/platform/windows/__init__.py	2011-08-17 12:43:42 +0000
+++ ubuntuone/platform/windows/__init__.py	2011-10-03 14:06:49 +0000
@@ -36,6 +36,7 @@
     make_dir,
     make_link,
     move_to_trash,
+    native_rename,
     normpath,
     open_file,
     path_exists,

=== modified file 'ubuntuone/platform/windows/os_helper.py'
--- ubuntuone/platform/windows/os_helper.py	2011-09-01 10:53:13 +0000
+++ ubuntuone/platform/windows/os_helper.py	2011-10-03 14:06:49 +0000
@@ -568,11 +568,11 @@
 @windowspath(path_indexes=[0, 1])
 def rename(path_from, path_to):
     """Rename a file or directory."""
-    return _rename(path_from, path_to)
-
-
-def _rename(path_from, path_to):
-    """Rename a file or directory."""
+    return native_rename(path_from, path_to)
+
+
+def native_rename(path_from, path_to):
+    """Rename a file or directory, using native paths."""
     # No need to do any specific handling for invalid characters since
     # 'path_from' and 'path_to' are valid windows paths.
     # Also, to ensure the same behaviors as on linux, use the MoveFileExW function
@@ -598,7 +598,7 @@
         if os.path.isdir(path_to):
             path_to = os.path.join(path_to, os.path.basename(path_from))
         try:
-            _rename(path_from, path_to)
+            native_rename(path_from, path_to)
         except OSError, e:
             raise IOError(e.errno, str(e))
     else:

=== modified file 'ubuntuone/platform/xdg_base_directory/__init__.py'
--- ubuntuone/platform/xdg_base_directory/__init__.py	2011-08-24 16:24:01 +0000
+++ ubuntuone/platform/xdg_base_directory/__init__.py	2011-10-03 14:06:49 +0000
@@ -18,8 +18,11 @@
 
 import os
 
-from ubuntu_sso.xdg_base_directory import xdg_cache_home
+from ubuntu_sso.xdg_base_directory import xdg_cache_home, native_path
 
+# All usage of the ubuntuone_log_dir is for native access,
+# so we only change it here
 ubuntuone_log_dir = os.path.join(xdg_cache_home, 'ubuntuone', 'log')
+ubuntuone_log_dir = native_path(ubuntuone_log_dir)
 if not os.path.exists(ubuntuone_log_dir):
     os.makedirs(ubuntuone_log_dir)

=== modified file 'ubuntuone/syncdaemon/config.py'
--- ubuntuone/syncdaemon/config.py	2011-08-24 16:24:01 +0000
+++ ubuntuone/syncdaemon/config.py	2011-10-03 14:06:49 +0000
@@ -25,9 +25,15 @@
 
 from ConfigParser import NoOptionError, NoSectionError
 from optparse import OptionParser
-from ubuntuone.platform import path_exists, rename
+# We should not use standard functions from os_helper here,
+# because the configglue superclasses do not use them.
+# Instead, all paths used in this module should be "native",
+# that is: utf8 str on linux, or (unicode or mbcs str) on windows
+from ubuntuone.platform import native_rename
 from ubuntu_sso.xdg_base_directory import (
     load_config_paths,
+    native_path,
+    syncdaemon_path,
     save_config_path,
     xdg_data_home,
     xdg_cache_home,
@@ -70,7 +76,8 @@
 logger = logging.getLogger('ubuntuone.SyncDaemon.config')
 
 # get (and possibly create if don't exists) the user config file
-_user_config_path = os.path.join(save_config_path('ubuntuone'), CONFIG_FILE)
+_user_config_path = os.path.join(native_path(save_config_path('ubuntuone')),
+                                 CONFIG_FILE)
 
 # module private config instance.
 # this object is the shared config
@@ -85,7 +92,7 @@
     Return the path using user home + value.
 
     """
-    result = os.path.expanduser(path_from_unix(value))
+    result = syncdaemon_path(os.path.expanduser(path_from_unix(value)))
     assert isinstance(result, str)
     return result
 
@@ -151,12 +158,13 @@
     """
     config_files = []
     for xdg_config_dir in load_config_paths('ubuntuone'):
+        xdg_config_dir = native_path(xdg_config_dir)
         config_file = os.path.join(xdg_config_dir, CONFIG_FILE)
-        if path_exists(config_file):
+        if os.path.exists(config_file):
             config_files.append(config_file)
 
         config_logs = os.path.join(xdg_config_dir, CONFIG_LOGS)
-        if path_exists(config_logs):
+        if os.path.exists(config_logs):
             config_files.append(config_logs)
 
     # reverse the list as load_config_paths returns the user dir first
@@ -164,11 +172,11 @@
     # if we are running from a branch, get the config files from it too
     config_file = os.path.join(os.path.dirname(__file__), os.path.pardir,
                                os.path.pardir, 'data', CONFIG_FILE)
-    if path_exists(config_file):
+    if os.path.exists(config_file):
         config_files.append(config_file)
 
     config_logs = os.path.join('data', CONFIG_LOGS)
-    if path_exists(config_logs):
+    if os.path.exists(config_logs):
         config_files.append(config_logs)
 
     return config_files
@@ -293,9 +301,9 @@
                 self.remove_section(section)
         with open(self.config_file + '.new', 'w') as fp:
             self.write(fp)
-        if path_exists(self.config_file):
-            rename(self.config_file, self.config_file + '.old')
-        rename(self.config_file + '.new', self.config_file)
+        if os.path.exists(self.config_file):
+            native_rename(self.config_file, self.config_file + '.old')
+        native_rename(self.config_file + '.new', self.config_file)
 
     def get_parsed(self, section, option):
         """get that fallbacks to our custom defaults"""

=== modified file 'ubuntuone/syncdaemon/filesystem_notifications.py'
--- ubuntuone/syncdaemon/filesystem_notifications.py	2011-08-09 12:56:06 +0000
+++ ubuntuone/syncdaemon/filesystem_notifications.py	2011-10-03 14:06:49 +0000
@@ -19,7 +19,7 @@
 import os
 import re
 
-from ubuntuone.platform import path_exists
+from ubuntuone.platform import access, path_exists
 from ubuntuone.syncdaemon.mute_filter import MuteFilter
 from ubuntuone import logger
 # our logging level
@@ -97,7 +97,7 @@
         # check first if the platform code knows hat to do with it
         if not self.platform_is_ignored(path):
             # check if we can read
-            if path_exists(path) and not os.access(path, os.R_OK):
+            if path_exists(path) and not access(path):
                 self.log.warning("Ignoring path as we don't have enough "
                                  "permissions to track it: %r", path)
                 return True

=== modified file 'ubuntuone/syncdaemon/main.py'
--- ubuntuone/syncdaemon/main.py	2011-08-25 20:20:23 +0000
+++ ubuntuone/syncdaemon/main.py	2011-10-03 14:06:49 +0000
@@ -24,6 +24,7 @@
 
 from twisted.internet import defer, reactor, task
 
+from ubuntu_sso.xdg_base_directory import native_path
 from ubuntuone.syncdaemon import (
     action_queue,
     config,
@@ -84,7 +85,7 @@
         self.shares_dir_link = os.path.join(self.root_dir, shares_symlink_name)
         self.data_dir = data_dir
         self.partials_dir = partials_dir
-        self.tritcask_dir = os.path.join(self.data_dir, 'tritcask')
+        tritcask_dir = os.path.join(self.data_dir, 'tritcask')
         self.logger = logging.getLogger('ubuntuone.SyncDaemon.Main')
         user_config = config.get_user_config()
         if read_limit is None:
@@ -99,7 +100,7 @@
         self.logger.info("Using %r as root dir", self.root_dir)
         self.logger.info("Using %r as data dir", self.data_dir)
         self.logger.info("Using %r as shares root dir", self.shares_dir)
-        self.db = tritcask.Tritcask(self.tritcask_dir)
+        self.db = tritcask.Tritcask(native_path(tritcask_dir))
         self.vm = volume_manager.VolumeManager(self)
         self.fs = filesystem_manager.FileSystemManager(
             data_dir, partials_dir, self.vm, self.db)

=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2011-09-06 17:13:11 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2011-10-03 14:06:49 +0000
@@ -54,6 +54,7 @@
     listdir,
     make_dir,
     normpath,
+    open_file,
     path_exists,
     read_link,
     recursive_move,
@@ -1448,7 +1449,7 @@
             make_dir(self._data_dir, recursive=True)
             self.update_metadata_version()
         elif path_exists(self._version_file):
-            with open(self._version_file) as fh:
+            with open_file(self._version_file) as fh:
                 md_version = fh.read().strip()
             if not md_version:
                 # we don't have a version of the metadata but a .version file?
@@ -1464,7 +1465,7 @@
         """Write the version of the metadata."""
         if not path_exists(os.path.dirname(self._version_file)):
             make_dir(os.path.dirname(self._version_file), recursive=True)
-        with open(self._version_file, 'w') as fd:
+        with open_file(self._version_file, 'w') as fd:
             fd.write(VolumeManager.METADATA_VERSION)
             # make sure the data get to disk
             fd.flush()