Revision: 7770
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7770&view=rev
Author: efiring
Date: 2009-09-16 23:38:54 +0000 (Wed, 16 Sep 2009)
Log Message:
-----------
Don't use wxversion with py2exe; fix by Werner Bruhin
Modified Paths:
--------------
branches/v0_99_maint/lib/matplotlib/backends/backend_wx.py
Modified: branches/v0_99_maint/lib/matplotlib/backends/backend_wx.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/backends/backend_wx.py 2009-09-16
14:13:26 UTC (rev 7769)
+++ branches/v0_99_maint/lib/matplotlib/backends/backend_wx.py 2009-09-16
23:38:54 UTC (rev 7770)
@@ -110,24 +110,25 @@
missingwx = "Matplotlib backend_wx and backend_wxagg require wxPython >=2.8"
-try:
- import wxversion
-except ImportError:
- raise ImportError(missingwx)
+if not hasattr(sys, 'frozen'): # i.e., not py2exe
+ try:
+ import wxversion
+ except ImportError:
+ raise ImportError(missingwx)
-# Some early versions of wxversion lack AlreadyImportedError.
-# It was added around 2.8.4?
-try:
- _wx_ensure_failed = wxversion.AlreadyImportedError
-except AttributeError:
- _wx_ensure_failed = wxversion.VersionError
+ # Some early versions of wxversion lack AlreadyImportedError.
+ # It was added around 2.8.4?
+ try:
+ _wx_ensure_failed = wxversion.AlreadyImportedError
+ except AttributeError:
+ _wx_ensure_failed = wxversion.VersionError
-try:
- wxversion.ensureMinimal('2.8')
-except _wx_ensure_failed:
- pass
-# We don't really want to pass in case of VersionError, but when
-# AlreadyImportedError is not available, we have to.
+ try:
+ wxversion.ensureMinimal('2.8')
+ except _wx_ensure_failed:
+ pass
+ # We don't really want to pass in case of VersionError, but when
+ # AlreadyImportedError is not available, we have to.
try:
import wx
@@ -776,7 +777,7 @@
bind(self, wx.EVT_MIDDLE_DOWN, self._onMiddleButtonDown)
bind(self, wx.EVT_MIDDLE_DCLICK, self._onMiddleButtonDown)
bind(self, wx.EVT_MIDDLE_UP, self._onMiddleButtonUp)
-
+
self.SetBackgroundStyle(wx.BG_STYLE_CUSTOM)
self.macros = {} # dict from wx id to seq of macros
@@ -1257,7 +1258,7 @@
if self.HasCapture(): self.ReleaseMouse()
FigureCanvasBase.button_release_event(self, x, y, 1, guiEvent=evt)
- #Add middle button events
+ #Add middle button events
def _onMiddleButtonDown(self, evt):
"""Start measuring on an axis."""
x = evt.GetX()
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
