conduit r1709 - in trunk: . conduit conduit/datatypes

[jstowers svn gnome org]

Author: jstowers
Date: Fri Aug 29 23:51:29 2008
New Revision: 1709
URL: http://svn.gnome.org/viewvc/conduit?rev=1709&view=rev

Log:
	* NEWS: Updates
	* conduit/Vfs.py:
	* conduit/datatypes/File.py: Fix file pickle/unpickle.


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/NEWS
   trunk/conduit/Vfs.py
   trunk/conduit/datatypes/File.py

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Fri Aug 29 23:51:29 2008
@@ -3,6 +3,8 @@
 * Merge improved iPod support by Alexandre Rosenfeld. This was implemented as
   part of GSOC08 and features
   * Improved audio/video transcoding using GStreamer
+* Support Webkit web browser
+* Support GIO
 
 NEW in 0.3.13.1:
 ==============

Modified: trunk/conduit/Vfs.py
==============================================================================
--- trunk/conduit/Vfs.py	(original)
+++ trunk/conduit/Vfs.py	Fri Aug 29 23:51:29 2008
@@ -20,8 +20,6 @@
 FileMonitor     = FileImpl.FileMonitor     
 FolderScanner   = FileImpl.FolderScanner
 
-print FileImpl.FolderScanner
-
 def uri_is_valid(uri):
     """
     Checks if the uri is valid (i.e. not a local path), and its type

Modified: trunk/conduit/datatypes/File.py
==============================================================================
--- trunk/conduit/datatypes/File.py	(original)
+++ trunk/conduit/datatypes/File.py	Fri Aug 29 23:51:29 2008
@@ -431,6 +431,16 @@
         fd, name = tempfile.mkstemp(prefix="netsync")
         os.write(fd, data['data'])
         os.close(fd)
+
+        implName = conduit.FILE_IMPL
+        if implName == "GnomeVfs":
+            import conduit.platform.FileGnomeVfs as FileImpl
+        elif implName == "GIO":
+            import conduit.platform.FileGio as FileImpl
+        elif implName == "Python":
+            import conduit.platform.FilePython as FileImpl
+        else:
+            raise Exception("File Implementation %s Not Supported" % implName)
         
         self._file = FileImpl.FileImpl(name)
         self.basePath = data['basePath']