gnome-games r7642 - in trunk/glchess: . src/lib src/lib/chess

[rancell svn gnome org]

Author: rancell
Date: Sat May 10 06:02:02 2008
New Revision: 7642
URL: http://svn.gnome.org/viewvc/gnome-games?rev=7642&view=rev

Log:
Handle unknown tokens (Bug #526252),  Correctly catch and display PGN errors

Modified:
   trunk/glchess/ChangeLog
   trunk/glchess/src/lib/chess/pgn.py
   trunk/glchess/src/lib/main.py

Modified: trunk/glchess/src/lib/chess/pgn.py
==============================================================================
--- trunk/glchess/src/lib/chess/pgn.py	(original)
+++ trunk/glchess/src/lib/chess/pgn.py	Sat May 10 06:02:02 2008
@@ -286,9 +286,12 @@
                     self.comment = ''
                     break
                 else:
-                    tokenType = self.tokens[text[0]]
+                    try:
+                        tokenType = self.tokens[text[0]]
+                    except KeyError:
+                        raise Error("Unknown token %s" % repr(text))                        
                     self.parseToken(tokenType, text)
-                    
+
             if self.comment is None:
                 return True
             

Modified: trunk/glchess/src/lib/main.py
==============================================================================
--- trunk/glchess/src/lib/main.py	(original)
+++ trunk/glchess/src/lib/main.py	Sat May 10 06:02:02 2008
@@ -378,7 +378,7 @@
         try:
             p = chess.pgn.PGN(path, 1)
         except chess.pgn.Error, e:
-            return e.description
+            return e.message
         except IOError, e:
             return e.strerror