[GRASS-SVN] r31024 - grass/trunk/gui/wxpython/gui_modules
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Apr 17 17:19:54 EDT 2008
Author: martinl
Date: 2008-04-17 17:19:54 -0400 (Thu, 17 Apr 2008)
New Revision: 31024
Modified:
grass/trunk/gui/wxpython/gui_modules/globalvar.py
Log:
wxGUI: check wx version, select '2.8'
Modified: grass/trunk/gui/wxpython/gui_modules/globalvar.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/globalvar.py 2008-04-17 20:53:43 UTC (rev 31023)
+++ grass/trunk/gui/wxpython/gui_modules/globalvar.py 2008-04-17 21:19:54 UTC (rev 31024)
@@ -20,15 +20,33 @@
import sys
import locale
-### recursive import problem
-# import utils
-# utils.CheckForWx()
-try:
- import wx
-except locale.Error, e:
- print >> sys.stderr, "Unable to set locale:", e
- os.environ['LC_ALL'] = ''
- import wx
+def CheckForWx():
+ """Try to import wx module and check its version"""
+ majorVersion = 2.8
+ minorVersion = 1.1
+
+ try:
+ import wxversion
+ wxversion.select(str(majorVersion))
+ import wx
+ version = wx.__version__
+ if float(version[:3]) < majorVersion:
+ raise ValueError('You are using wxPython version %s' % str(version))
+ if float(version[:3]) == 2.8 and \
+ float(version[4:]) < minorVersion:
+ raise ValueError('You are using wxPython version %s' % str(version))
+
+ except (ImportError, ValueError, wxversion.VersionError), e:
+ print >> sys.stderr, 'ERROR: ' + str(e) + \
+ '. wxPython >= %s.%s is required. Detailed information in README file.' % \
+ (str(majorVersion), str(minorVersion))
+ sys.exit(1)
+ except locale.Error, e:
+ print >> sys.stderr, "Unable to set locale:", e
+ os.environ['LC_ALL'] = ''
+
+CheckForWx()
+import wx
import wx.lib.flatnotebook as FN
try:
@@ -99,23 +117,3 @@
"""@Toolbar icon size"""
toolbarSize = (24, 24)
-
-def CheckForWx():
- """Try to import wx module and check its version"""
- majorVersion = 2.8
- minorVersion = 1.1
- try:
- import wx
- version = wx.__version__
- if float(version[:3]) < majorVersion:
- raise ValueError('You are using wxPython version %s' % str(version))
- if float(version[:3]) == 2.8 and \
- float(version[4:]) < minorVersion:
- raise ValueError('You are using wxPython version %s' % str(version))
-
- except (ImportError, ValueError), e:
- print >> sys.stderr, 'ERROR: ' + str(e) + \
- '. wxPython >= %s.%s is required. Detailed information in README file.' % \
- (str(majorVersion), str(minorVersion))
- sys.exit(1)
-
More information about the grass-commit
mailing list