Changes in / [e843a1c:0c4bca6] in sasview

Location:

src/sas/perspectives

Files:

• fitting/report_dialog.py (modified) (2 diffs)
• invariant/report_dialog.py (modified) (2 diffs)

src/sas/perspectives/fitting/report_dialog.py

@@ -17 +17 @@
 import os
 import wx.html as html
-import logging
 
 _STATICBOX_WIDTH = 480
@@ -298 +297 @@
         """
         Create a PDF file from html source string.
-        Returns True is the file creation was successful. 
         
         : data: html string
         : filename: name of file to be saved
         """
-        try:
-            from xhtml2pdf import pisa
-            # open output file for writing (truncated binary)
-            resultFile = open(filename, "w+b")
-            # convert HTML to PDF
-            pisaStatus = pisa.CreatePDF(data, dest=resultFile)
-            # close output file
-            resultFile.close()
-            self.Update()
-            return pisaStatus.err
-        except:
-            logging.error("Error creating pdf: %s" % sys.exc_value)
-        return False
+        import ho.pisa as pisa
+        f = file(filename, "wb")
+        # pisa requires some extra packages, see their web-site
+        pdf = pisa.CreatePDF(data, f)
+
+        # close the file here otherwise it will be open until quitting
+        #the application.
+        f.close()
+        self.Update()
+        return not pdf.err

src/sas/perspectives/invariant/report_dialog.py

@@ -18 +18 @@
 import os
 import wx.html as html
-import logging
 ISPDF = False
 if sys.platform == "win32":
@@ -247 +246 @@
     def HTML2PDF(self, data, filename):
         """
-        Create a PDF file from html source string.
-        Returns True is the file creation was successful. 
+        Create a PDF file from html source string. 
         
         : data: html string
         : filename: name of file to be saved
         """
-        try:
-            from xhtml2pdf import pisa
-            # open output file for writing (truncated binary)
-            resultFile = open(filename, "w+b")
-            # convert HTML to PDF
-            pisaStatus = pisa.CreatePDF(data, dest=resultFile)
-            # close output file
-            resultFile.close()
-            self.Update()
-            return pisaStatus.err
-        except:
-            logging.error("Error creating pdf: %s" % sys.exc_value)
-        return False
+        import ho.pisa as pisa
+        f = file(filename, "wb")
+        # pisa requires some extra packages, see their web-site
+        pdf = pisa.CreatePDF(data, f)
+        # close the file here otherwise it will be open until quitting
+        #the application.
+        f.close()
+
+        return not pdf.err
+
+        
+