Changeset 116 for 05/devel/v.py

Timestamp:

03/22/04 21:15:31 (5 years ago)

Author:

ug

Message:

Various encodings fixes

Files:

• 05/devel/v.py (modified) (8 diffs)

05/devel/v.py

@@ -962 +962 @@
         t.append('\n')
 
-        if node.has_key('EV'): t.append(node['EV'][0] + ', ')
-        if node.has_key('RO'): t.append(node['RO'][0] + ', ')
-        if node.has_key('DT'): t.append(node['DT'][0] + '\n')
+        if node.has_key('EV'): t.append(cursor.transcode('EV', node) + ', ')
+        if node.has_key('RO'): t.append(cursor.transcode('RO', node) + ', ')
+        if node.has_key('DT'): t.append(cursor.transcode('DT', node) + '\n')
 
         s1 = cursor.transcode('GC',node)
@@ -2591 +2591 @@
         keylist = ['PB', 'BR', 'PW', 'WR', 'EV', 'RE', 'DT', 'KM']
         for key in keylist:
-            self.gameinfoDict[key] = [self.gameinfoVars[key].get()]
+            self.gameinfoDict[key] = [self.gameinfoVars[key].get().encode(self.gameinfoDictencoding, 'ignore')]
           
-        self.gameinfoDict['GC'] = [strip(self.gameinfoGCText.get('1.0', END))]
+        self.gameinfoDict['GC'] = [strip(self.gameinfoGCText.get('1.0', END)).encode(self.gameinfoDictencoding, 'ignore')]
 
         for key in keylist + ['GC']:
@@ -2599 +2599 @@
                 del self.gameinfoDict[key]
 
-        s = self.gameinfoOthersText.get('1.0', END)
+        s = self.gameinfoOthersText.get('1.0', END).encode(self.gameinfoDictencoding, 'ignore')
         try:
             d = Cursor(('(;' + s + ')'),1).getRootNode(0)
@@ -2612 +2612 @@
             showwarning('SGF Error', "Parse error in 'Other SGF tags'")
         else:
-
-            for k in self.gameinfoDict.keys():
-                try:
-                    self.gameinfoDict[k] = [ x.encode(self.gameinfoDictencoding, 'ignore')\
-                                             for x in self.gameinfoDict[k] ]
-                except:
-                    pass
-                
-            if not self.returnChanges: self.currentFileChanged()
-
-            
+            if not self.returnChanges: self.currentFileChanged()            
             self.gameinfoWindow.destroy()
 
         
     def gameinfoCancel(self):
-        for k in self.gameinfoDict.keys():
-            try:
-                self.gameinfoDict[k] = [ x.encode(self.gameinfoDictencoding, 'ignore')\
-                                         for x in self.gameinfoDict[k] ]
-            except:
-                pass
+        self.gameinfoDict = None
         self.gameinfoWindow.destroy()
 
@@ -2639 +2624 @@
         """ Open window with the game info of the current game."""
 
-        if encoding == '': encoding = self.cursor.encoding
-        # FIXME: sollte dies nicht sein: if self.cursor.encoding: encoding = self.cursor.encoding ?
-        
         if not data and not self.cursor:
             return
@@ -2650 +2632 @@
                 showwarning('Error', 'SGF Error')
                 return
+            encoding = self.cursor.encoding
             self.returnChanges = 0
         else:
@@ -2665 +2648 @@
             for k in self.gameinfoDict.keys():
                 try:
-                    self.gameinfoDict[k] = [x.decode(encoding, 'ignore') for x in self.gameinfoDict[k]]
+                    self.gameinfoDict[k] = [x.decode(encoding, 'ignore').encode('utf-8', 'ignore') \
+                                            for x in self.gameinfoDict[k]]
                 except:
                     pass
@@ -2727 +2711 @@
         if self.returnChanges:
             return self.gameinfoDict
-        else:
+        elif not self.gameinfoDict is None:
             self.cursor.updateRootNode(self.gameinfoDict, self.cursor.currentGame)
             s = '[' + `self.cursor.currentGame` + '] '