Revision: 7416
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7416&view=rev
Author: jdh2358
Date: 2009-08-07 15:40:56 +0000 (Fri, 07 Aug 2009)
Log Message:
-----------
don't fail on window icon load
Modified Paths:
--------------
branches/v0_99_maint/doc/devel/coding_guide.rst
branches/v0_99_maint/lib/matplotlib/backends/backend_gtk.py
Modified: branches/v0_99_maint/doc/devel/coding_guide.rst
===================================================================
--- branches/v0_99_maint/doc/devel/coding_guide.rst 2009-08-07 14:26:35 UTC
(rev 7415)
+++ branches/v0_99_maint/doc/devel/coding_guide.rst 2009-08-07 15:40:56 UTC
(rev 7416)
@@ -24,17 +24,11 @@
svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/\
matplotlib mpl --username=youruser --password=yourpass
-Branch checkouts, eg the maintenance branch::
+Branch checkouts, eg the release branch::
- svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/\
- v0_91_maint mpl91 --username=youruser --password=yourpass
+ svn co
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_99_maint mpl99
-The current release of the trunk is in the 0.98.5 maintenance branch::
- svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/\
- v0_98_5_maint mpl98.5 --username=youruser --password=yourpass
-
-
Committing changes
------------------
@@ -64,11 +58,10 @@
:file:`MANIFEST.in`. This file determines what goes into the source
distribution of the mpl build.
-* Keep the maintenance branch (0.91) the latest release branch (eg
- 0.98.4) and trunk in sync where it makes sense. If there is a bug
- on both that needs fixing, use `svnmerge.py
- <http://www.orcaware.com/svn/wiki/Svnmerge.py>`_ to keep them in
- sync. See :ref:`svn-merge` below.
+* Keep the release branch (eg 0.90 and trunk in sync where it makes
+ sense. If there is a bug on both that needs fixing, use
+ `svnmerge.py <http://www.orcaware.com/svn/wiki/Svnmerge.py>`_ to
+ keep them in sync. See :ref:`svn-merge` below.
.. _svn-merge:
@@ -96,7 +89,7 @@
svnmerge.py merge -S BRANCHNAME
Where BRANCHNAME is the name of the branch to merge *from*,
- e.g. v0_98_5_maint.
+ e.g. v0_99_maint.
If you wish to merge only specific revisions (in an unusual
situation), do::
Modified: branches/v0_99_maint/lib/matplotlib/backends/backend_gtk.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/backends/backend_gtk.py 2009-08-07
14:26:35 UTC (rev 7415)
+++ branches/v0_99_maint/lib/matplotlib/backends/backend_gtk.py 2009-08-07
15:40:56 UTC (rev 7416)
@@ -440,8 +440,15 @@
self.window = gtk.Window()
self.window.set_title("Figure %d" % num)
if (window_icon):
- self.window.set_icon_from_file(window_icon)
-
+ try:
+ self.window.set_icon_from_file(window_icon)
+ except:
+ # some versions of gtk throw a glib.GError but not
+ # all, so I am not sure how to catch it. I am unhappy
+ # diong a blanket catch here, but an not sure what a
+ # better way is - JDH
+ verbose.report('Could not load matplotlib icon: %s' %
sys.exc_info()[1])
+
self.vbox = gtk.VBox()
self.window.add(self.vbox)
self.vbox.show()
@@ -666,7 +673,11 @@
window = gtk.Window()
if (window_icon):
- window.set_icon_from_file(window_icon)
+ try: window.set_icon_from_file(window_icon)
+ except:
+ # we presumably already logged a message on the
+ # failure of the main plot, don't keep reporting
+ pass
window.set_title("Subplot Configuration Tool")
window.set_default_size(w, h)
vbox = gtk.VBox()
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
