conduit r1367 - in trunk: . conduit

[thomasvm svn gnome org]

Author: thomasvm
Date: Wed Mar 12 07:26:27 2008
New Revision: 1367
URL: http://svn.gnome.org/viewvc/conduit?rev=1367&view=rev

Log:
2008-03-12  Thomas Van Machelen <thomas vanmachelen gmail com>
	* conduit/Vfs.py: Don't escape the filename, it only causes sync
	conflicts when working with unicode objects
	* conduit/DeltraProvider.py: Make sure everything is converted to
	unicode when comparing.  Fixes #519708


Modified:
   trunk/ChangeLog
   trunk/conduit/DeltaProvider.py
   trunk/conduit/Vfs.py

Modified: trunk/conduit/DeltaProvider.py
==============================================================================
--- trunk/conduit/DeltaProvider.py	(original)
+++ trunk/conduit/DeltaProvider.py	Wed Mar 12 07:26:27 2008
@@ -32,7 +32,9 @@
         for i in self.me.module.get_all():
             #Maybe we should be unicode....
             assert type(i) in [str,unicode], "LUID Must be str not %s" % type(i)
-            allItems.append(i)
+            #Make sure the are in unicode to assure good comparison with mapping UID's
+            allItems.append(unicode(i))
+
         log.debug("Delta: Got %s items\n%s" % (len(allItems), allItems))
 
         #In order to detect deletions we need to fetch all the existing relationships.
@@ -64,4 +66,3 @@
         #and all that remains in allItems is new data
         return allItems, modified, rids.keys()
 
-

Modified: trunk/conduit/Vfs.py
==============================================================================
--- trunk/conduit/Vfs.py	(original)
+++ trunk/conduit/Vfs.py	Wed Mar 12 07:26:27 2008
@@ -310,7 +310,7 @@
             try: fileinfo = hdir.next()
             except StopIteration: continue;
             while fileinfo:
-                filename = uri_escape(fileinfo.name)
+                filename = fileinfo.name
                 if filename in [".","..",CONFIG_FILE_NAME]: 
                         pass
                 else: