--- versionedFile/versionedFile.py	2006/06/18 12:55:30	1.64
+++ versionedFile/versionedFile.py	2006/10/03 14:40:26	1.67
@@ -860,14 +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
-        try:
-         l=list(d.compare(data.splitlines(1),tmp.splitlines(1)))
+
+	try:
+	        l=list(d.compare(data.splitlines(1),tmp.splitlines(1)))
         except:
-            return 0,""
+		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