[GRASS-SVN] r47755 - grass/branches/releasebranch_6_4/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-08-18 09:33:00 -0700 (Thu, 18 Aug 2011)
New Revision: 47755

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/ghelp.py
Log:
wxGUI: fix contributors page (todo: sort by names)
      (merge r47750 from trunk)


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/ghelp.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/ghelp.py	2011-08-18 16:28:40 UTC (rev 47754)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/ghelp.py	2011-08-18 16:33:00 UTC (rev 47755)
@@ -668,16 +668,16 @@
         contribfile = os.path.join(os.getenv("GISBASE"), "contributors.csv")
         if os.path.exists(contribfile):
             contribFile = open(contribfile, 'r')
-            contribs = dict()
+            contribs = list()
             errLines = list()
-            for line in contribFile.readlines():
+            for line in contribFile.readlines()[1:]:
                 line = line.rstrip('\n')
                 try:
                     cvs_id, name, email, country, osgeo_id, rfc2_agreed = line.split(',')
                 except ValueError:
                     errLines.append(line)
                     continue
-                contribs[osgeo_id] = [name, email, country]
+                contribs.append((name, email, country, osgeo_id))
             contribFile.close()
             
             if errLines:
@@ -704,8 +704,8 @@
             for item in (_('Name'), _('E-mail'), _('Country'), _('OSGeo_ID')):
                 contribBox.Add(item = wx.StaticText(parent = contribwin, id = wx.ID_ANY,
                                                     label = item))
-            for osgeo_id in sorted(contribs.keys()):
-                for item in contribs[osgeo_id] + [osgeo_id]:
+            for vals in contribs:
+                for item in vals:
                     contribBox.Add(item = wx.StaticText(parent = contribwin, id = wx.ID_ANY,
                                                         label = item))
             contribwin.sizer.Add(item = contribBox, proportion = 1,