Mercurial > babel > old > mirror

diff babel/messages/catalog.py @ 339:6811369cb912
Fix iterkeys/iteritems/itervalues/pop/popitem methods on the `odict` utility class. Thanks to Armin Ronacher for the patch.
author: cmlenz
date: Wed, 11 Jun 2008 22:12:09 +0000
parents: 662d332c0a2b
children: 90849c44c531
--- a/babel/messages/catalog.py
+++ b/babel/messages/catalog.py
@@ -667,7 +667,7 @@
                 else:
                     message.previous_id = list(oldmsg.id)
             else:
-                oldmsg = remaining.pop(oldkey)
+                oldmsg = remaining.pop(oldkey, None)
             message.string = oldmsg.string
             if isinstance(message.id, (list, tuple)):
                 if not isinstance(message.string, (list, tuple)):