[Erp5-report] r41115 hugo.maia - in /erp5/trunk/utils/cloudooo/cloudooo: ./ tests/

[nobody at svn.erp5.org]

Author: hugo.maia
Date: Sat Dec  4 00:17:38 2010
New Revision: 41115

URL: http://svn.erp5.org?rev=41115&view=rev
Log:
Refactor getFile. Now returns an empty string for not existent file

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/document.py
    erp5/trunk/utils/cloudooo/cloudooo/tests/testOdfDocument.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/document.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/document.py?rev=41115&r1=41114&r2=41115&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/document.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/document.py [utf8] Sat Dec  4 00:17:38 2010
@@ -163,8 +163,8 @@ class OdfDocument(object):
     return self._zipfile.read('content.xml')
 
   def getFile(self, path):
-    """If exists, returns file as string, else return None"""
+    """If exists, returns file as string, else return an empty string"""
     try:
       return self._zipfile.read(path)
     except KeyError:
-      return None
+      return ''

Modified: erp5/trunk/utils/cloudooo/cloudooo/tests/testOdfDocument.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/tests/testOdfDocument.py?rev=41115&r1=41114&r2=41115&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/tests/testOdfDocument.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/tests/testOdfDocument.py [utf8] Sat Dec  4 00:17:38 2010
@@ -55,7 +55,7 @@ class TestOdfDocument(cloudoooTestCase):
   def testGetNotPresentFile(self):
     """Test if the getFile method returns None for not present file request"""
     requested_file = self.oodocument.getFile('not_present.xml')
-    self.assertEquals(requested_file, None)
+    self.assertEquals(requested_file, '')
 
   def testParseContent(self):
     """Test if the _parsed_content attribute is the parsed content.xml"""