[Erp5-report] r45914 arnaud.fontaine - /slapos/trunk/util/slapos.tool.nosqltester_manager/s...

[nobody at svn.erp5.org]

Author: arnaud.fontaine
Date: Sat Jun 18 14:50:47 2011
New Revision: 45914

URL: http://svn.erp5.org?rev=45914&view=rev
Log:
Fix compress_method

Modified:
    slapos/trunk/util/slapos.tool.nosqltester_manager/src/slapos/tool/nosqltester_manager/__init__.py

Modified: slapos/trunk/util/slapos.tool.nosqltester_manager/src/slapos/tool/nosqltester_manager/__init__.py
URL: http://svn.erp5.org/slapos/trunk/util/slapos.tool.nosqltester_manager/src/slapos/tool/nosqltester_manager/__init__.py?rev=45914&r1=45913&r2=45914&view=diff
==============================================================================
--- slapos/trunk/util/slapos.tool.nosqltester_manager/src/slapos/tool/nosqltester_manager/__init__.py [utf8] (original)
+++ slapos/trunk/util/slapos.tool.nosqltester_manager/src/slapos/tool/nosqltester_manager/__init__.py [utf8] Sat Jun 18 14:50:47 2011
@@ -187,15 +187,12 @@ class NoSQLTesterManager(object):
     :param format: compression format. (with a leading *'.'*)
     :type format: str.
     """
-    
-    rdata = None
-    if format == "":
-      rdata = cdata
-    elif format == ".bz2":
-      rdata = bz2.decompress(cdata)
+    if format == ".bz2":
+      return bz2.decompress(cdata)
     elif format == ".zip":
-      pass
-    return rdata
+      raise NotImplementedError
+    else:
+      raise ValueError, "Unknown format: %s" % str(format)
 
   def waitForReports(self, **host_parameter_kw):
     """
@@ -297,18 +294,18 @@ class NoSQLTesterManager(object):
       
       :returns: empty string.
       """
-      
       if request.method == 'POST' and \
          'url' in request.form and \
          'filename' in request.form:
         try:
           data = None
           f = urllib2.urlopen(request.form['url'])
-          if 'compress_method' in request.form:
-            data = self.uncompress(f.read(), request.form['compress_method'])
-          else:
-            data = f.read()
+          data = f.read()
           f.close()
+
+          compress_method = request.form.get('compress_method', None)
+          if compress_method:
+            data = self.uncompress(data, compress_method)
           
           if data is not None:
             filepathname = os.path.join(self.log_directory, request.form['filename'])