windows: fix for brushpack import

Write .png file in binary mode.
And don't bother to obfuscate useful exceptions.

diff --git a/gui/brushmanager.py b/gui/brushmanager.py
index 40773bb..ee0dda3 100644 (file)
--- a/gui/brushmanager.py
+++ b/gui/brushmanager.py
@@ -300,7 +300,7 @@ class BrushManager:
                     myb_f = open(prefix + '.myb', 'w')
                     myb_f.write(myb_data)
                     myb_f.close()
-                    preview_f = open(prefix + '_prev.png', 'w')
+                    preview_f = open(prefix + '_prev.png', 'wb')
                     preview_f.write(preview_data)
                     preview_f.close()
                     b.load()

diff --git a/gui/drawwindow.py b/gui/drawwindow.py
index b762d90..1b4c7d7 100644 (file)
--- a/gui/drawwindow.py
+++ b/gui/drawwindow.py
@@ -411,15 +411,8 @@ class Window(windowing.MainWindow):
     def import_brush_pack_cb(self, *trash):
         format_id, filename = dialogs.open_dialog(_("Import brush package..."), self,
                                  [(_("MyPaint brush package (*.zip)"), "*.zip")])
-        if filename is not None:
-            #try:
+        if filename:
             self.app.brushmanager.import_brushpack(filename,  self)
-            #except Exception, e:
-            #    d = gtk.MessageDialog(self, buttons=gtk.BUTTONS_OK_CANCEL, type=gtk.MESSAGE_ERROR)
-            #    text = _("An error occured while importing brush package. Error was: %s") % e
-            #    d.set_markup(text)
-            #    d.run()
-            #    d.destroy()
 
     # INFORMATION
     # TODO: Move into dialogs.py?