conduit r1869 - in trunk: . conduit/datatypes conduit/platform test/python-tests

[jstowers svn gnome org]

Author: jstowers
Date: Fri Feb 13 05:19:36 2009
New Revision: 1869
URL: http://svn.gnome.org/viewvc/conduit?rev=1869&view=rev

Log:
2009-02-13  John Stowers  <john stowers gmail com>

	* test/python-tests/common.py: Initialize the
	typeconverter for tests properly.

	* conduit/datatypes/File.py: Fix pickling of
	proxy file types

	* conduit/platform/FileGio.py: Drop the workaround
	for bug #547133 now that all distros are 
	shipping gvfs > 0.99.6



Modified:
   trunk/ChangeLog
   trunk/conduit/datatypes/File.py
   trunk/conduit/platform/FileGio.py
   trunk/test/python-tests/common.py

Modified: trunk/conduit/datatypes/File.py
==============================================================================
--- trunk/conduit/datatypes/File.py	(original)
+++ trunk/conduit/datatypes/File.py	Fri Feb 13 05:19:36 2009
@@ -433,7 +433,9 @@
         data['group'] = self.group
         data['filename'] = self.get_filename()
         data['filemtime'] = self.get_mtime()
-
+        data['isproxyfile'] = self._isProxyFile
+        data['proxyfilesize'] = self._proxyFileSize
+        
         #FIXME: Maybe we should tar this first...
         data['data'] = open(self.get_local_uri(), 'rb').read()
 
@@ -462,6 +464,8 @@
         self.group = data['group']
         self._defer_rename(data['filename'])
         self._defer_new_mtime(data['filemtime'])
+        self._isProxyFile = data['isproxyfile']
+        self._proxyFileSize = data['proxyfilesize']
 
         DataType.DataType.__setstate__(self, data)
 

Modified: trunk/conduit/platform/FileGio.py
==============================================================================
--- trunk/conduit/platform/FileGio.py	(original)
+++ trunk/conduit/platform/FileGio.py	Fri Feb 13 05:19:36 2009
@@ -74,19 +74,13 @@
             return None
         
     def get_mtime(self):
-        #FIXME: Workaround for 
-        #http://bugzilla.gnome.org/show_bug.cgi?id=547133
-        if self._file.get_uri_scheme() in ("http", "ftp"):
-            from conduit.utils import get_http_resource_last_modified
-            return get_http_resource_last_modified(self._file.get_uri())
+        self._get_file_info()
+        mtime = self.fileInfo.get_attribute_uint64('time::modified')
+        if mtime:
+            return mtime
         else:
-            self._get_file_info()
-            mtime = self.fileInfo.get_attribute_uint64('time::modified')
-            if mtime:
-                return mtime
-            else:
-                #convert 0L -> None
-                return None
+            #convert 0L -> None
+            return None
 
     def get_filename(self):
         self._get_file_info()

Modified: trunk/test/python-tests/common.py
==============================================================================
--- trunk/test/python-tests/common.py	(original)
+++ trunk/test/python-tests/common.py	Fri Feb 13 05:19:36 2009
@@ -299,7 +299,7 @@
         conduit.GLOBALS.moduleManager = self.model
         self.model.load_all(whitelist=None, blacklist=None)
         self.type_converter = TypeConverter.TypeConverter(self.model)
-        conduit.GLOBALS.typeManager = self.type_converter
+        conduit.GLOBALS.typeConverter = self.type_converter
         self.sync_manager = Synchronization.SyncManager(self.type_converter)
         conduit.GLOBALS.syncManager = self.sync_manager