String exceptions are not allowed in Python >= 2.6.

slapos/grid/slapgrid.py

@@ -1026,17 +1026,17 @@ class Slapgrid(object):
     for computer_partition_usage in computer_partition_usage_list:
       try:
         root = etree.fromstring(computer_partition_usage.usage)
-      except UnicodeError:
+      except UnicodeError, e:
         self.logger.info("Failed to read %s." % (
             computer_partition_usage.usage))
         self.logger.error(UnicodeError)
-        raise "Failed to read %s." % (computer_partition_usage.usage)
+        raise UnicodeError("Failed to read %s: %s" % (computer_partition_usage.usage, e))
       except (etree.XMLSyntaxError, etree.DocumentInvalid) as e:
         self.logger.info("Failed to parse %s." % (computer_partition_usage.usage))
         self.logger.error(e)
         raise _formatXMLError(e)
-      except Exception:
-        raise "Failed to generate XML report."
+      except Exception, e:
+        raise Exception("Failed to generate XML report: %s" % e)
 
       for movement in root.findall('movement'):
         xml.append('<movement>')
@@ -1220,7 +1220,7 @@ class Slapgrid(object):
           slap_computer_usage.reportUsage(computer_consumption)
         else:
           logger.info('XML file generated by asXML is not valid !')
-          raise 'XML file generated by asXML is not valid !'
+          raise ValueError('XML file generated by asXML is not valid !')
       except Exception:
         computer_partition_id = computer_partition.getId()
         exception = traceback.format_exc()