From ff474dffabc4baa781e8b10d9c53fec4342c233a Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Mon, 23 Jan 2006 04:36:08 +0000 Subject: [PATCH] magic-removal: Removed 'where_constraints' parameter to 'class Meta' git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2115 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/manager.py | 3 --- django/db/models/options.py | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/django/db/models/manager.py b/django/db/models/manager.py index 4a0892f38b..262a696294 100644 --- a/django/db/models/manager.py +++ b/django/db/models/manager.py @@ -84,9 +84,6 @@ class Manager(object): where.extend(where2) params.extend(params2) - # Add any additional constraints from the "where_constraints" parameter. - where.extend(opts.where_constraints) - # Add additional tables and WHERE clauses based on select_related. if kwargs.get('select_related') is True: fill_table_cache(opts, select, tables, where, opts.db_table, [opts.db_table]) diff --git a/django/db/models/options.py b/django/db/models/options.py index 315811a0f1..97d3659f60 100644 --- a/django/db/models/options.py +++ b/django/db/models/options.py @@ -10,8 +10,7 @@ import re get_verbose_name = lambda class_name: re.sub('([A-Z])', ' \\1', class_name).lower().strip() DEFAULT_NAMES = ('verbose_name', 'verbose_name_plural', 'db_table', 'ordering', - 'unique_together', 'where_constraints', 'permissions', - 'get_latest_by', 'order_with_respect_to') + 'unique_together', 'permissions', 'get_latest_by', 'order_with_respect_to') class Options: def __init__(self, meta): @@ -21,7 +20,6 @@ class Options: self.db_table = '' self.ordering = [] self.unique_together = [] - self.where_constraints = [] self.permissions = [] self.object_name, self.app_label = None, None self.get_latest_by = None