# HG changeset patch # User cmlenz # Date 1216386561 0 # Node ID 3bfce5e0030dc900dcfd6c79891c78595e1994ef # Parent df4bda99cf8efd022da73d4b343d53c66a021dc5 Fix for memory leak reported in #128. Thanks to Manlio Perillo for reporting the problem. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,8 @@ * 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 --- a/babel/localedata.py +++ b/babel/localedata.py @@ -174,6 +174,9 @@ 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 @@ 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):