diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-04-26 16:41:51 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-04-26 16:41:51 +0000 |
| commit | 177f7d51647f4d6be6b840c32a4abbf460ed03be (patch) | |
| tree | 850981273b6d668f7b0ccfb665335341ad2d333f /django/db/models/query.py | |
| parent | 0b30bed861680f28396c9bd94c05ad5f1f4c3394 (diff) | |
queryset-refactor: Added a Model.from_sequence() constructor for internal and
advanced usage.
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@7474 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/query.py')
| -rw-r--r-- | django/db/models/query.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py index 1bafa64805..e1e2bb19f2 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -153,7 +153,7 @@ class QuerySet(object): obj, _ = get_cached_row(self.model, row, index_start, max_depth, requested=requested) else: - obj = self.model(*row[index_start:]) + obj = self.model.from_sequence(row[index_start:]) for i, k in enumerate(extra_select): setattr(obj, k, row[i]) yield obj @@ -646,7 +646,7 @@ def get_cached_row(klass, row, index_start, max_depth=0, cur_depth=0, restricted = requested is not None index_end = index_start + len(klass._meta.fields) - obj = klass(*row[index_start:index_end]) + obj = klass.from_sequence(row[index_start:index_end]) for f in klass._meta.fields: if (not f.rel or (not restricted and f.null) or (restricted and f.name not in requested) or f.rel.parent_link): |