From 5089651e17d91c32019cd55b4a86b2bc771c2f62 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Wed, 21 Sep 2016 11:23:57 +0000
Subject: [PATCH] Don't use EmptyQuerySet directly; return Class.objects.none()
 instead.  - Legacy-Id: 12013

---
 ietf/doc/utils.py        | 3 +--
 ietf/doc/views_search.py | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ietf/doc/utils.py b/ietf/doc/utils.py
index d378ed7d9..626a14dd2 100644
--- a/ietf/doc/utils.py
+++ b/ietf/doc/utils.py
@@ -7,7 +7,6 @@ import hashlib
 import json
 
 from django.conf import settings
-from django.db.models.query import EmptyQuerySet
 from django.forms import ValidationError
 from django.utils.html import escape
 from django.core.urlresolvers import reverse as urlreverse
@@ -146,7 +145,7 @@ def needed_ballot_positions(doc, active_positions):
         elif isinstance(doc,DocHistory):
             related_set = doc.relateddochistory_set
         else:
-            related_set = EmptyQuerySet()
+            related_set = RelatedDocHistory.objects.none()
         for rel in related_set.filter(relationship__slug__in=['tops', 'tois', 'tohist', 'toinf', 'tobcp', 'toexp']):
             if (rel.target.document.std_level.slug in ['bcp','ps','ds','std']) or (rel.relationship.slug in ['tops','tois','tobcp']):
                 needed = two_thirds_rule(recused=len(recuse))
diff --git a/ietf/doc/views_search.py b/ietf/doc/views_search.py
index f2b250409..e1ae950e8 100644
--- a/ietf/doc/views_search.py
+++ b/ietf/doc/views_search.py
@@ -38,7 +38,6 @@ from django.conf import settings
 from django.core.cache import cache
 from django.core.urlresolvers import reverse as urlreverse
 from django.db.models import Q
-from django.db.models.query import EmptyQuerySet
 from django.http import Http404, HttpResponseBadRequest, HttpResponse, HttpResponseRedirect, QueryDict
 from django.shortcuts import render
 from django.utils.cache import _generate_cache_key
@@ -144,7 +143,7 @@ def retrieve_search_results(form, all_types=False):
         types.extend(query["doctypes"])
 
         if not types:
-            return EmptyQuerySet()
+            return Document.objects.none()
 
         docs = Document.objects.filter(type__in=types)