summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-01-17 17:27:04 -0500
committerTim Graham <timograham@gmail.com>2014-01-17 18:12:45 -0500
commitb87c59b04bc549a5ba42023d04e4be7a4737f7d9 (patch)
tree28882a0befab318da61a839a9ac49ca8e852dc00 /django
parent298a2b577ffbe7f8ed00588694c792ac9adcefbe (diff)
Removed some unnecessary __exact operators in filters.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/options.py2
-rw-r--r--django/contrib/admin/templatetags/log.py2
-rw-r--r--django/contrib/contenttypes/generic.py2
-rw-r--r--django/contrib/flatpages/views.py4
-rw-r--r--django/contrib/sites/managers.py2
5 files changed, 6 insertions, 6 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index 263d1f4a87..0f2404bf40 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -1620,7 +1620,7 @@ class ModelAdmin(BaseModelAdmin):
app_label = opts.app_label
action_list = LogEntry.objects.filter(
object_id=unquote(object_id),
- content_type__id__exact=ContentType.objects.get_for_model(model).id
+ content_type=ContentType.objects.get_for_model(model)
).select_related().order_by('action_time')
context = dict(self.admin_site.each_context(),
diff --git a/django/contrib/admin/templatetags/log.py b/django/contrib/admin/templatetags/log.py
index 7605d7f7fe..01b54c29c7 100644
--- a/django/contrib/admin/templatetags/log.py
+++ b/django/contrib/admin/templatetags/log.py
@@ -18,7 +18,7 @@ class AdminLogNode(template.Node):
user_id = self.user
if not user_id.isdigit():
user_id = context[self.user].pk
- context[self.varname] = LogEntry.objects.filter(user__pk__exact=user_id).select_related('content_type', 'user')[:int(self.limit)]
+ context[self.varname] = LogEntry.objects.filter(user__pk=user_id).select_related('content_type', 'user')[:int(self.limit)]
return ''
diff --git a/django/contrib/contenttypes/generic.py b/django/contrib/contenttypes/generic.py
index 1ec5475f5b..a92f0f0dc8 100644
--- a/django/contrib/contenttypes/generic.py
+++ b/django/contrib/contenttypes/generic.py
@@ -324,7 +324,7 @@ def create_generic_related_manager(superclass):
self.pk_val = self.instance._get_pk_val()
self.core_filters = {
'%s__pk' % content_type_field_name: content_type.id,
- '%s__exact' % object_id_field_name: instance._get_pk_val(),
+ '%s' % object_id_field_name: instance._get_pk_val(),
}
def __call__(self, **kwargs):
diff --git a/django/contrib/flatpages/views.py b/django/contrib/flatpages/views.py
index 0f87c90bfe..117fbb6f55 100644
--- a/django/contrib/flatpages/views.py
+++ b/django/contrib/flatpages/views.py
@@ -35,12 +35,12 @@ def flatpage(request, url):
site_id = get_current_site(request).id
try:
f = get_object_or_404(FlatPage,
- url__exact=url, sites__id__exact=site_id)
+ url=url, sites=site_id)
except Http404:
if not url.endswith('/') and settings.APPEND_SLASH:
url += '/'
f = get_object_or_404(FlatPage,
- url__exact=url, sites__id__exact=site_id)
+ url=url, sites=site_id)
return HttpResponsePermanentRedirect('%s/' % request.path)
else:
raise
diff --git a/django/contrib/sites/managers.py b/django/contrib/sites/managers.py
index 9cdc1ed413..173f439775 100644
--- a/django/contrib/sites/managers.py
+++ b/django/contrib/sites/managers.py
@@ -39,4 +39,4 @@ class CurrentSiteManager(models.Manager):
def get_queryset(self):
if not self.__is_validated:
self._validate_field_name()
- return super(CurrentSiteManager, self).get_queryset().filter(**{self.__field_name + '__id__exact': settings.SITE_ID})
+ return super(CurrentSiteManager, self).get_queryset().filter(**{self.__field_name + '__id': settings.SITE_ID})