Revision: 8569
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8569&view=rev
Author: mdboom
Date: 2010-07-23 13:18:47 +0000 (Fri, 23 Jul 2010)
Log Message:
-----------
Merged revisions 8568 via svnmerge from
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint
........
r8568 | mdboom | 2010-07-23 09:17:15 -0400 (Fri, 23 Jul 2010) | 2 lines
Prevent traceback when window icon can not be loaded in Gtk backend.
........
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py
Property Changed:
----------------
trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
- /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428
/branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8566
/trunk/matplotlib:1-7315
+ /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428
/branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8568
/trunk/matplotlib:1-7315
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py 2010-07-23
13:17:15 UTC (rev 8568)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py 2010-07-23
13:18:47 UTC (rev 8569)
@@ -33,6 +33,7 @@
from matplotlib import lines
from matplotlib import cbook
+from matplotlib import verbose
backend_version = "%d.%d.%d" % gtk.pygtk_version
@@ -1224,7 +1225,6 @@
window_icon = None
verbose.report('Could not load matplotlib icon: %s' % sys.exc_info()[1])
-
def error_msg_gtk(msg, parent=None):
if parent is not None: # find the toplevel gtk.Window
parent = parent.get_toplevel()
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
