Changeset 6756
- Timestamp:
- 11/29/07 16:08:04 (1 year ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/branches/queryset-refactor/django/contrib/formtools/preview.py
r6339 r6756 110 110 # Use HIGHEST_PROTOCOL because it's the most efficient. It requires 111 111 # Python 2.3, but Django requires 2.3 anyway, so that's OK. 112 pickled = pickle.dumps(data, p rotocol=pickle.HIGHEST_PROTOCOL)112 pickled = pickle.dumps(data, pickle.HIGHEST_PROTOCOL) 113 113 return md5.new(pickled).hexdigest() 114 114 django/branches/queryset-refactor/django/db/models/options.py
r6730 r6756 174 174 """ 175 175 cache = dict([(f.name, (f, True, False)) for f in self.fields]) 176 cache.update([(f.name, (f, True, True)) for f in self.many_to_many]) 177 cache.update([(f.field.related_query_name(), (f, False, True)) 178 for f in self.get_all_related_many_to_many_objects()]) 179 cache.update([(f.field.related_query_name(), (f, False, False)) 180 for f in self.get_all_related_objects()]) 176 for f in self.many_to_many: 177 cache[f.name] = (f, True, True) 178 for f in self.get_all_related_many_to_many_objects(): 179 cache[f.field.related_query_name()] = (f, False, True) 180 for f in self.get_all_related_objects(): 181 cache[f.field.related_query_name()] = (f, False, False) 181 182 if app_cache_ready(): 182 183 self._name_map = cache django/branches/queryset-refactor/django/db/models/query.py
r6730 r6756 396 396 opts = self.model._meta 397 397 all = dict([(field.column, field) for field in opts.fields]) 398 all.update([(field.name, field) for field in opts.fields]) 398 for field in opts.fields: 399 all[field.name] = field 399 400 if not self.query.extra_select: 400 401 try:
