From: Christopher Lenz <cmlenz@gmail.com>
Date: Fri, 18 Jul 2008 13:09:21 +0000 (+0000)
Subject: Fix for memory leak reported in #128. Thanks to Manlio Perillo for reporting the... 
X-Git-Tag: 1.0~287
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3413b21cf4795bdbd66f32bdadb5e8996c54f3db;p=thirdparty%2Fbabel.git

Fix for memory leak reported in #128. Thanks to Manlio Perillo for reporting the problem.
---

diff --git a/ChangeLog b/ChangeLog
index 5fdfdb66..70fdb2a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@ http://svn.edgewall.org/repos/babel/tags/0.9.4/
  * Currency symbol definitions that is defined with choice patterns in the
    CLDR data are no longer imported, so the symbol code will be used instead.
  * Fixed quarter support in date formatting.
+ * Fixed a serious memory leak that was introduces by the support for CLDR
+   aliases in 0.9.3 (ticket #128).
 
 
 Version 0.9.3
diff --git a/babel/localedata.py b/babel/localedata.py
index 5a76f6ae..203bec80 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -174,6 +174,9 @@ class Alias(object):
             data = data[key]
         if isinstance(data, Alias):
             data = data.resolve(base)
+        elif isinstance(data, tuple):
+            alias, others = data
+            data = alias.resolve(base)
         return data
 
 
@@ -185,19 +188,21 @@ class LocaleDataDict(DictMixin, dict):
     def __init__(self, data, base=None):
         dict.__init__(self, data)
         if base is None:
-            base = self
+            base = data
         self.base = base
 
     def __getitem__(self, key):
-        val = dict.__getitem__(self, key)
+        orig = val = dict.__getitem__(self, key)
         if isinstance(val, Alias): # resolve an alias
             val = val.resolve(self.base)
         if isinstance(val, tuple): # Merge a partial dict with an alias
             alias, others = val
             val = alias.resolve(self.base).copy()
             merge(val, others)
-        if isinstance(val, dict): # Return a nested alias-resolving dict
+        if type(val) is dict: # Return a nested alias-resolving dict
             val = LocaleDataDict(val, base=self.base)
+        if val is not orig:
+            self[key] = val
         return val
 
     def copy(self):