fix: simplification for sending error image

Author: fstagni

src/DIRAC/AccountingSystem/Service/ReportGeneratorHandler.py

@@ -200,12 +200,8 @@ def __generatePlotFromFileId(self, fileId):
         return S_OK(result["Value"][fileToReturn])
 
     def __sendErrorAsImg(self, msgText, fileHelper):
-        retVal = generateErrorMessagePlot(msgText)
-        retVal = fileHelper.sendData(retVal["Value"])
-        if not retVal["OK"]:
-            return retVal
+        fileHelper.sendData(generateErrorMessagePlot(msgText))
         fileHelper.sendEOF()
-        return S_OK()
 
     def transfer_toClient(self, fileId, token, fileHelper):
         """

src/DIRAC/Core/Utilities/Plotting/Plots.py

@@ -50,7 +50,7 @@ def generateErrorMessagePlot(msgText):
     textGraph(msgText, fn, {})
     data = fn.getvalue()
     fn.close()
-    return S_OK(data)
+    return data
 
 
 def generateTimedStackedBarPlot(fileName, data, metadata):

src/DIRAC/MonitoringSystem/Service/MonitoringHandler.py

@@ -159,18 +159,11 @@ def __generatePlotFromFileId(self, fileId):
 
     def __sendErrorAsImg(self, msgText, fileHelper):
         """
-        In case of an error message a whcite plot is created with the error message.
+        In case of an error message a white plot is created with the error message.
         """
 
-        retVal = generateErrorMessagePlot(msgText)
-        if not retVal:
-            retVal = fileHelper.sendData(retVal["Message"])
-        else:
-            retVal = fileHelper.sendData(retVal["Value"])
-            if not retVal["OK"]:
-                return retVal
-            fileHelper.sendEOF()
-        return S_OK()
+        fileHelper.sendData(generateErrorMessagePlot(msgText))
+        fileHelper.sendEOF()
 
     def __checkPlotRequest(self, reportRequest):
         """

tests/Integration/AccountingSystem/Test_Plots.py

@@ -290,9 +290,8 @@ def test_error():
     """
 
     res = generateErrorMessagePlot("testing error message")
-    assert res["OK"] is True
     with open(filename, "wb") as out:
-        out.write(res["Value"])
+        out.write(res)
 
     res = compare(filename, os.path.join(plots_directory, "error.png"))
     assert res == 0.0