--- versionedFile/versionedFile.py	2006/06/18 12:55:30	1.64
+++ versionedFile/versionedFile.py	2006/10/04 07:35:27	1.68
@@ -9,7 +9,6 @@ from Products.PageTemplates.ZopePageTemp
 from AccessControl import ClassSecurityInfo
 from difflib import Differ
 from pprint import pprint
-
 from Products.ZCatalog.CatalogPathAwareness import CatalogAware
 
 try:
@@ -136,6 +135,7 @@ class versionedFileFolder(Folder,ECHO_ba
                 {'label':'Position of version number','action':'changeHistoryFileNamesForm'},
                 )
 
+            
     def changeHistoryFileNamesForm(self):
         """change position of version num"""
         pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeHistoryFileNamesForm.zpt')).__of__(self)
@@ -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
@@ -1064,4 +1074,4 @@ def manage_addVersionedFile(self,id,titl
 
 
 InitializeClass(versionedFile)
-InitializeClass(versionedFileFolder)
+InitializeClass(versionedFileFolder)
\ No newline at end of file