Merge lp:~nataliabidart/ubuntuone-client/no-custom-abspath into lp:ubuntuone-client

[Natalia Bidart]

- No more custom abspath, credits to Manuel de la Peña (LP: #812976).

[lp:~nataliabidart/ubuntuone-client/no-custom-abspath]

1057. By Natalia Bidart on 2011-07-19

Removing no longer valid comments about prepending \\?\ when dealing with tritcask.

[Manuel de la Peña (mandel)]

review: Approve

[Alejandro J. Cura (alecu)]

Looks great. Thanks mandel and nessita!

review: Approve

=== modified file 'tests/platform/test_filesystem_notifications.py'
--- tests/platform/test_filesystem_notifications.py	2011-04-19 15:33:42 +0000
+++ tests/platform/test_filesystem_notifications.py	2011-07-19 16:19:28 +0000
@@ -84,7 +84,6 @@
         self.root_dir = platform_mangled_path(self.mktemp('root_dir'))
         self.home_dir = platform_mangled_path(self.mktemp('home_dir'))
         self.vm = testcase.FakeVolumeManager(self.root_dir)
-        # FIXME: Trictask cannot deal with \\\\?\\ infornt of files
         self.tritcask_dir = self.mktemp("tritcask_dir")
         self.db = Tritcask(self.tritcask_dir)
         self.fs = filesystem_manager.FileSystemManager(fsmdir, partials_dir,
 
=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2011-07-08 12:21:59 +0000
+++ tests/syncdaemon/test_vm.py	2011-07-19 16:19:28 +0000
@@ -59,7 +59,6 @@
     VolumeDoesNotExist,
 )
 from ubuntuone.platform import (
-    abspath,
     get_udf_path,
     make_link,
     make_dir,
@@ -576,7 +575,7 @@
                                                    'Modify')
         # initialize the the root
         self.vm._got_root('root_uuid')
-        shared_dir = abspath(os.path.join(self.root_dir, 'shared_dir'))
+        shared_dir = os.path.abspath(os.path.join(self.root_dir, 'shared_dir'))
         self.main.fs.create(path=shared_dir, share_id="", is_dir=True)
         self.main.fs.set_node_id(shared_dir, shared_response.subtree)
         response = ListShares(None)
@@ -628,7 +627,7 @@
             self.assertEquals('View', access_level)
             self.assertTrue(marker is not None)
             share = self.vm.marker_share_map[marker]
-            self.assertEquals(abspath(path), share.path)
+            self.assertEquals(os.path.abspath(path), share.path)
             self.assertEquals('View', share.access_level)
             self.assertEquals(marker, share.volume_id)
             self.assertEquals('fake_user', share.other_username)
@@ -654,7 +653,7 @@
     @defer.inlineCallbacks
     def test_create_share_missing_node_id(self):
         """Test VolumeManager.create_share in the case of missing node_id."""
-        path = abspath(os.path.join(self.vm.root.path, 'shared_path'))
+        path = os.path.abspath(os.path.join(self.vm.root.path, 'shared_path'))
         self.main.fs.create(path, "")
         expected_node_id = uuid.uuid4()
         expected_share_id = uuid.uuid4()
@@ -877,9 +876,7 @@
         for path in paths:
             self.assertTrue(self.main.event_q.has_watch(path))
         # remove the watches
-        # TODO: because tritcask does not work well with \\?\ we are adding it
-        # here rather than in mktemp which is the correct place to do it
-        self.vm._remove_watches(abspath(self.root_dir))
+        self.vm._remove_watches(os.path.abspath(self.root_dir))
         for path in paths:
             self.assertFalse(self.main.event_q.has_watch(path), path)
 
@@ -893,16 +890,14 @@
 
         os.rename(path, path+'.old')
         # remove the watches
-        # TODO: because tritcask does not work well with \\?\ we are adding it
-        # here rather than in mktemp which is the correct place to do it
-        self.vm._remove_watches(abspath(self.root_dir))
+        self.vm._remove_watches(os.path.abspath(self.root_dir))
 
         self.assertFalse(self.main.event_q.has_watch(path),
                          'watch should not be present')
 
     def test_delete_fsm_object(self):
         """Test for VolumeManager._delete_fsm_object"""
-        path = abspath(os.path.join(self.root_dir, 'dir'))
+        path = os.path.abspath(os.path.join(self.root_dir, 'dir'))
         make_dir(path, recursive=True)
         self.main.fs.create(path, "", is_dir=True)
         self.main.fs.set_node_id(path, 'dir_node_id')
@@ -1217,7 +1212,7 @@
         dirs = ['dir', os.path.join('dir','subdir'),
                 os.path.join('dir', 'empty_dir')]
         for i, dir in enumerate(dirs):
-            path = abspath(os.path.join(share.path, dir))
+            path = os.path.abspath(os.path.join(share.path, dir))
             with allow_writes(os.path.split(share.path)[0]):
                 with allow_writes(share.path):
                     if not os.path.exists(path):
@@ -1227,7 +1222,7 @@
         files = ['a_file', os.path.join('dir', 'file'),
                  os.path.join('dir', 'subdir', 'file')]
         for i, path in enumerate(files):
-            path = abspath(os.path.join(share.path, path))
+            path = os.path.abspath(os.path.join(share.path, path))
             with allow_writes(os.path.split(share.path)[0]):
                 with allow_writes(share.path):
                     open(path, 'w').close()
@@ -1292,7 +1287,7 @@
         share = self.vm.shares['share_id']
         shouldbe_dir = os.path.join(self.shares_dir,
                                     get_share_dir_name(share_response))
-        self.assertEquals(abspath(shouldbe_dir), share.path)
+        self.assertEquals(os.path.abspath(shouldbe_dir), share.path)
 
     def test_handle_SHARES_visible_username(self):
         """test the handling of AQ_SHARE_LIST with non-ascii visible uname."""
@@ -1311,7 +1306,7 @@
         share = self.vm.shares['share_id']
         shouldbe_dir = os.path.join(self.shares_dir,
                                     get_share_dir_name(share_response))
-        self.assertEquals(abspath(shouldbe_dir), share.path)
+        self.assertEquals(os.path.abspath(shouldbe_dir), share.path)
 
     def test_handle_SV_SHARE_CHANGED_sharename(self):
         """test the handling of SV_SHARE_CHANGED for non-ascii share name."""
@@ -1323,8 +1318,8 @@
         self.vm.handle_SV_SHARE_CHANGED(info=share_holder)
         shouldbe_dir = os.path.join(self.shares_dir,
                                     get_share_dir_name(share_holder))
-        self.assertEquals(abspath(shouldbe_dir),
-                          abspath(self.vm.shares['share_id'].path))
+        self.assertEquals(os.path.abspath(shouldbe_dir),
+                          os.path.abspath(self.vm.shares['share_id'].path))
 
     def test_handle_SV_SHARE_CHANGED_visible(self):
         """test the handling of SV_SHARE_CHANGED for non-ascii visible name."""
@@ -1336,8 +1331,8 @@
         self.vm.handle_SV_SHARE_CHANGED(info=share_holder)
         shouldbe_dir = os.path.join(self.shares_dir,
                                     get_share_dir_name(share_holder))
-        self.assertEquals(abspath(shouldbe_dir),
-                          abspath(self.vm.shares['share_id'].path))
+        self.assertEquals(os.path.abspath(shouldbe_dir),
+                          os.path.abspath(self.vm.shares['share_id'].path))
 
 
 class VolumeManagerVolumesTests(BaseVolumeManagerTests):
@@ -1358,7 +1353,8 @@
 
         with environ('HOME', self.home_dir):
             udf = self._create_udf(suggested_path=suggested_path)
-            self.assertEquals(map(abspath, map(os.path.expanduser, expected)),
+            self.assertEquals(map(os.path.abspath,
+                              map(os.path.expanduser, expected)),
                               udf.ancestors)
 
     @defer.inlineCallbacks
@@ -1368,8 +1364,8 @@
         udf = self._create_udf(suggested_path='~/' + suggested_path,
                                subscribed=False)
         yield self.vm.add_udf(udf)
-        self.assertEquals(abspath(os.path.join(self.home_dir, suggested_path)),
-                          abspath(udf.path))
+        self.assertEquals(os.path.abspath(os.path.join(self.home_dir, suggested_path)),
+                          os.path.abspath(udf.path))
         self.assertEquals(1, len(self.vm.udfs))
         # check that the UDF is in the fsm metadata
         mdobj = self.main.fs.get_by_path(udf.path)
@@ -1383,8 +1379,8 @@
         # add it again, but this time with subscribed = True
         udf.subscribed = True
         yield self.vm.add_udf(udf)
-        self.assertEquals(abspath(os.path.join(self.home_dir, suggested_path)),
-                          abspath(udf.path))
+        self.assertEquals(os.path.abspath(os.path.join(self.home_dir, suggested_path)),
+                          os.path.abspath(udf.path))
         self.assertEquals(1, len(self.vm.udfs))
         # check that the UDF is in the fsm metadata
         mdobj = self.main.fs.get_by_path(udf.path)
@@ -1531,8 +1527,8 @@
         self.assertEqual('fake_share_uuid', share.node_id)
         udf = self.vm.udfs[str(udf_id)]
         self.assertEqual('udf_uuid', udf.node_id)
-        self.assertEqual(abspath(os.path.join(self.home_dir, 'UDF')),
-                         abspath(udf.path))
+        self.assertEqual(os.path.abspath(os.path.join(self.home_dir, 'UDF')),
+                         os.path.abspath(udf.path))
         # check that the root it's there, have right node_id and generation
         self.assertIn(request.ROOT, self.vm.shares)
         root = self.vm.shares[request.ROOT]
@@ -1599,9 +1595,9 @@
         self.assertEqual('fake_share_uuid', share.node_id)
         udf = self.vm.udfs[str(udf_id)]
         self.assertEqual('udf_uuid', udf.node_id)
-        self.assertEqual(abspath(os.path.join(self.home_dir,
-                                              u'ñoño'.encode("utf8"))),
-                                              abspath(udf.path))
+        self.assertEqual(os.path.abspath(os.path.join(self.home_dir,
+                                         u'ñoño'.encode("utf8"))),
+                                         os.path.abspath(udf.path))
 
     def test_handle_AQ_LIST_VOLUMES_root(self):
         """Test the handling of the AQ_LIST_VOLUMES event."""
@@ -1778,8 +1774,8 @@
             self.assertIn(str(udf_id), self.vm.udfs)
             udf = self.vm.udfs[str(udf_id)]
             self.assertEqual('udf_uuid', udf.node_id)
-            self.assertEqual(abspath(os.path.join(self.home_dir, 'UDF')),
-                             abspath(udf.path))
+            self.assertEqual(os.path.abspath(os.path.join(self.home_dir, 'UDF')),
+                             os.path.abspath(udf.path))
             if auto_subscribe:
                 # root and udf
                 self.assertEqual(2, len(list(self.vm.get_volumes())))
@@ -1839,7 +1835,8 @@
         def check(info):
             """Check the udf attributes."""
             udf = info['udf']
-            self.assertEquals(abspath(udf.path), abspath(path))
+            self.assertEquals(os.path.abspath(udf.path),
+                              os.path.abspath(path))
             self.assertEquals(udf.volume_id, str(udf_id))
             self.assertEquals(udf.node_id, str(node_id))
             self.assertEquals(udf.suggested_path, u'~/MyUDF')
@@ -1898,7 +1895,8 @@
         def check_udf(info):
             """Check the udf attributes."""
             deleted_udf = info['volume']
-            self.assertEquals(abspath(deleted_udf.path), abspath(udf.path))
+            self.assertEquals(os.path.abspath(deleted_udf.path), 
+                              os.path.abspath(udf.path))
             self.assertEquals(deleted_udf.volume_id, udf.volume_id)
             self.assertEquals(deleted_udf.node_id, udf.node_id)
             self.assertEquals(deleted_udf.suggested_path, udf.suggested_path)
@@ -1912,7 +1910,7 @@
         def check_share(info):
             """Check the share attributes."""
             deleted_share = info['volume']
-            self.assertEquals(abspath(deleted_share.path), share.path)
+            self.assertEquals(os.path.abspath(deleted_share.path), share.path)
             self.assertEquals(deleted_share.volume_id, share.volume_id)
             self.assertEquals(deleted_share.node_id, share.node_id)
             self.assertNotIn(deleted_share.volume_id, self.vm.shares)
@@ -2230,7 +2228,7 @@
         def check(info):
             """The callback"""
             udf = info['udf']
-            self.assertEquals(abspath(udf.path), abspath(path))
+            self.assertEquals(os.path.abspath(udf.path), os.path.abspath(path))
             self.assertEquals(udf.volume_id, str(udf_id))
             self.assertEquals(udf.node_id, str(node_id))
             self.assertEquals(0, len(self.vm.marker_udf_map))
@@ -2276,7 +2274,8 @@
         def check(info):
             """Check the udf attributes."""
             deleted_udf = info['volume']
-            self.assertEquals(abspath(deleted_udf.path), abspath(udf.path))
+            self.assertEquals(os.path.abspath(deleted_udf.path),
+                              os.path.abspath(udf.path))
             self.assertEquals(deleted_udf.volume_id, udf.volume_id)
             self.assertEquals(deleted_udf.node_id, udf.node_id)
             self.assertEquals(deleted_udf.suggested_path, udf.suggested_path)
@@ -3368,7 +3367,8 @@
         mdobj = self.main.fs.get_by_path(udf.path)
         self.assertEquals(udf.node_id, mdobj.node_id)
         self.assertEquals(udf.id, mdobj.share_id)
-        self.assertEquals(abspath(udf.path), abspath(mdobj.path))
+        self.assertEquals(os.path.abspath(udf.path),
+                          os.path.abspath(mdobj.path))
 
     @defer.inlineCallbacks
     def test_volumes_rescan_cb_active_udf(self):
 
=== modified file 'ubuntuone/platform/linux/__init__.py'
--- ubuntuone/platform/linux/__init__.py	2011-07-08 12:21:59 +0000
+++ ubuntuone/platform/linux/__init__.py	2011-07-19 16:19:28 +0000
@@ -26,7 +26,6 @@
 from dbus.mainloop.glib import DBusGMainLoop
 
 from ubuntuone.platform.linux.os_helper import (
-    abspath,
     access,
     allow_writes,
     can_write,
 
=== modified file 'ubuntuone/platform/linux/os_helper.py'
--- ubuntuone/platform/linux/os_helper.py	2011-06-24 01:45:01 +0000
+++ ubuntuone/platform/linux/os_helper.py	2011-07-19 16:19:28 +0000
@@ -169,11 +169,6 @@
     return os.path.abspath(path).split(os.path.sep)
 
 
-def abspath(path):
-    """Return an abspath."""
-    return os.path.abspath(path)
-
-
 def normpath(path):
     """Normalize path, eliminating double slashes, etc."""
     return os.path.normpath(path)
 \ No newline at end of file
 
=== modified file 'ubuntuone/platform/windows/__init__.py'
--- ubuntuone/platform/windows/__init__.py	2011-07-08 12:21:59 +0000
+++ ubuntuone/platform/windows/__init__.py	2011-07-19 16:19:28 +0000
@@ -32,7 +32,6 @@
 
 
 from ubuntuone.platform.windows.os_helper import (
-    abspath,
     access,
     allow_writes,
     can_write,
 
=== modified file 'ubuntuone/platform/windows/os_helper.py'
--- ubuntuone/platform/windows/os_helper.py	2011-06-24 01:45:57 +0000
+++ ubuntuone/platform/windows/os_helper.py	2011-07-19 16:19:28 +0000
@@ -468,7 +468,7 @@
         path += '.lnk'
     shell = Dispatch('WScript.Shell')
     shortcut = shell.CreateShortCut(path)
-    return abspath(shortcut.Targetpath)
+    return os.path.abspath(shortcut.Targetpath)
 
 
 @absparam(paths_indexes=[0])
@@ -599,16 +599,6 @@
     return list
 
 
-def abspath(path):
-    """Return an abspath."""
-    # TODO: do we really need to do this, are the tests broken?
-    path = path.replace('/', '\\')
-    abs = os.path.abspath(remove_windows_illegal_chars(path))
-    if not LONG_PATH_PREFIX in abs:
-        abs = LONG_PATH_PREFIX + abs
-    return abs
-
-
 def normpath(path):
     """Normalize path, eliminating double slashes, etc."""
     # the basic normpath does not work correctly with \\?\ which we use
 
=== modified file 'ubuntuone/syncdaemon/filesystem_manager.py'
--- ubuntuone/syncdaemon/filesystem_manager.py	2011-06-24 01:48:27 +0000
+++ ubuntuone/syncdaemon/filesystem_manager.py	2011-07-19 16:19:28 +0000
@@ -49,7 +49,6 @@
     set_file_readwrite,
     stat_path,
 )
-from ubuntuone.platform import abspath as os_abspath
 from ubuntuone.platform import open_file as os_open
 
 METADATA_VERSION = "6"
@@ -1305,7 +1304,7 @@
             # the relaitve path is the fullpath
             return share_path
         else:
-            return os_abspath(os.path.join(share_path, path))
+            return os.path.abspath(os.path.join(share_path, path))
 
     def _enable_share_write(self, share_id, path, recursive=False):
         """Helper to create a EnableShareWrite context manager."""
 
=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2011-07-08 12:21:59 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2011-07-19 16:19:28 +0000
@@ -27,14 +27,17 @@
 import sys
 import shutil
 import stat
+
 from itertools import ifilter
 
+from twisted.internet import defer
 from ubuntuone.storageprotocol import request
 from ubuntuone.storageprotocol.volumes import (
     ShareVolume,
     UDFVolume,
     RootVolume,
 )
+
 from ubuntuone.syncdaemon.marker import MDMarker
 from ubuntuone.syncdaemon.interfaces import IMarker
 from ubuntuone.syncdaemon import file_shelf, config
@@ -57,10 +60,6 @@
     set_dir_readonly,
     set_dir_readwrite
 )
-from ubuntuone.platform import abspath as os_abspath
-
-from twisted.internet import defer
-
 
 # tritcask row types
 SHARE_ROW_TYPE = 3
@@ -1501,8 +1500,8 @@
            and os.path.exists(self._shared_md_dir):
             # we have shares and shared dirs
             # md_version >= 1
-            old_root_dir = os_abspath(os.path.join(self._root_dir, 'My Files'))
-            old_share_dir = os_abspath(os.path.join(self._root_dir,
+            old_root_dir = os.path.abspath(os.path.join(self._root_dir, 'My Files'))
+            old_share_dir = os.path.abspath(os.path.join(self._root_dir,
                                                  'Shared With Me'))
             if os.path.exists(old_share_dir) and os.path.exists(old_root_dir) \
                and not is_link(old_share_dir):
@@ -1521,7 +1520,7 @@
                 except OSError:
                     target = None
                 if is_link(self._shares_dir_link) \
-                   and normpath(target) == os_abspath(self._shares_dir_link):
+                   and normpath(target) == os.path.abspath(self._shares_dir_link):
                     # broken symlink, md_version = 4
                     md_version = '4'
                 else: