[GRASS-SVN] r60454 - grass/branches/releasebranch_7_0/gui/wxpython/gui_core

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-05-23 07:29:21 -0700 (Fri, 23 May 2014)
New Revision: 60454

Modified:
   grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py
Log:
fix broken import dialog on Windows and Mac due to wrong wildcard format (merge from trunk, r60453)

Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py	2014-05-23 14:26:38 UTC (rev 60453)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py	2014-05-23 14:29:21 UTC (rev 60454)
@@ -1366,7 +1366,8 @@
         fileMask += '%s (*.gz;*.GZ)|*.gz;*.GZ|' % _('GZIP files')
         fileMask += '%s (*.tar;*.TAR)|*.tar;*.TAR|' % _('TAR files')
         fileMask += '%s (*.tar.gz;*.TAR.GZ;*.tgz;*.TGZ)|*.tar.gz;*.TAR.GZ;*.tgz;*.TGZ|' % _('TARGZ files')
-        fileMask += '%(all)s (*.*)|*.*|' % {'all': _('All files')}
+        # don't include last '|' - windows and mac throw error
+        fileMask += '%(all)s (*.*)|*.*' % {'all': _('All files')}
         # only contains formats with extensions hardcoded    
 
         self.filePanel = wx.Panel(parent=self)