--- versionedFile/versionedFile.py	2006/06/17 16:21:23	1.62
+++ versionedFile/versionedFile.py	2006/10/03 14:40:26	1.67
@@ -833,7 +833,9 @@ class versionedFile(CatalogAware,Folder)
         le=lv.lastEditor()
         return le
     
-    
+    def getLockedBy(self):
+        """get locked by"""
+        return str(self.lockedBy)
         
     security.declarePublic('getLastVersion')
     def getLastVersion(self):
@@ -858,12 +860,24 @@ class versionedFile(CatalogAware,Folder)
     def diff(self,data):
         """differenz between lastversion and data"""
         d=Differ()
-        tmp=self.getLastVersion().data
+        data=data.rstrip()
+	try:
+	    tmp=self.getLastVersion().data.rstrip()
+	except:
+	    tmp=str(self.getLastVersion().data).rstrip()
         #print "XX",data,tmp
-        l=list(d.compare(data.splitlines(1),tmp.splitlines(1)))
-        
+
+	try:
+	        l=list(d.compare(data.splitlines(1),tmp.splitlines(1)))
+        except:
+		try:
+			l=list(d.compare(repr(data).splitlines(1),tmp.splitlines(1)))
+		except:
+			return 9999,[]
+
         plus=0
         minus=0
+
         for a in l:
             if a[0]=='+':
                 plus+=1