Changeset 4040 for waeup/branches/ulif-rewrite

Timestamp:

1 Apr 2009, 16:26:54 (16 years ago)

Author:

uli

Message:

Make importexport-API more consistent.

File:

• waeup/branches/ulif-rewrite/src/waeup/utils/importexport.py (modified) (1 diff)

waeup/branches/ulif-rewrite/src/waeup/utils/importexport.py

@@ -107 +107 @@
         else:
             filelike_obj = open(filepath, 'wb')
-        filelike_obj.write(result.toprettyxml(encoding='UTF-8'))
+        filelike_obj.write(result.toxml(encoding='UTF-8'))
         filelike_obj.seek(0)
         self.cleanUp()
         return filelike_obj
 
-    def exportPrettyXML(self, obj):
+    def exportPrettyXML(self, obj, filepath=None):
         result = self._export(obj).toprettyxml(encoding='UTF-8')
+        if filepath is None:
+            filelike_obj = StringIO()
+        else:
+            filelike_obj = open(filepath, 'wb')
+        filelike_obj.write(result)
+        filelike_obj.seek(0)
         self.cleanUp()
-        return result
+        return filelike_obj