/ - Diff - BIEN 3 - NCEAS Projects

« Previous | Next »

Revision 2667

sql_gen.py: ColDict: Extend dicts.DictProxy instead of UserDict.DictMixin because that already provides some of the functionality needed by ColDict

     import re
     import UserDict
     import dicts
     import objects
     import strings
     import util
-...
         if isinstance(col, NamedCol): col = col.code
         return col
     class ColDict(UserDict.DictMixin):
     class ColDict(dicts.DictProxy):
         '''A dict that automatically makes inserted entries Col objects'''
         def __init__(self, db, keys_table, dict_={}):
             dicts.DictProxy.__init__(self, {})
             keys_table = as_Table(keys_table)
             self.db = db
             self.table = keys_table
             self.dict = {}
             self.update(dict_) # after setting vars because __setitem__() needs them
         def copy(self): return ColDict(self.db, self.table, self.dict.copy())
         def copy(self): return ColDict(self.db, self.table, self.inner.copy())
         def keys(self): return self.dict.keys()
         def __getitem__(self, key):
             return dicts.DictProxy.__getitem__(self, self._key(key))
         def __getitem__(self, key): return self.dict[self._key(key)]
         def __setitem__(self, key, value):
             key = self._key(key)
             if value == None: value = self.db.col_default(key)
             self.dict[key] = as_Col(value, name=key.name)
             dicts.DictProxy.__setitem__(self, key, as_Col(value, name=key.name))
         def _key(self, key): return as_Col(key, self.table)

Also available in: Unified diff