diff --git a/django/db/models/base.py b/django/db/models/base.py
old mode 100644
new mode 100755
diff --git a/django/views/generic/dates.py b/django/views/generic/dates.py
index dc1f6e3..50726f5 100644
--- a/django/views/generic/dates.py
+++ b/django/views/generic/dates.py
@@ -186,7 +186,7 @@ class BaseDateListView(MultipleObjectMixin, DateMixin, View):
         Get a queryset properly filtered according to `allow_future` and any
         extra lookup kwargs.
         """
-        qs = self.get_queryset().filter(**lookup)
+        qs = self.get_query_set().filter(**lookup)
         date_field = self.get_date_field()
         allow_future = self.get_allow_future()
         allow_empty = self.get_allow_empty()
@@ -404,7 +404,7 @@ class BaseDayArchiveView(YearMixin, MonthMixin, DayMixin, BaseDateListView):
         """
         date_field = self.get_date_field()
 
-        field = self.get_queryset().model._meta.get_field(date_field)
+        field = self.get_query_set().model._meta.get_field(date_field)
         lookup_kwargs = _date_lookup_for_field(field, date)
 
         qs = self.get_dated_queryset(**lookup_kwargs)
@@ -460,7 +460,7 @@ class BaseDateDetailView(YearMixin, MonthMixin, DayMixin, DateMixin, BaseDetailV
                                  month, self.get_month_format(),
                                  day, self.get_day_format())
 
-        qs = self.get_queryset()
+        qs = self.get_query_set()
 
         if not self.get_allow_future() and date > datetime.date.today():
             raise Http404(_(u"Future %(verbose_name_plural)s not available because %(class_name)s.allow_future is False.") % {
@@ -564,7 +564,7 @@ def _get_next_prev_month(generic_view, naive_result, is_previous, use_first_day)
             lookup = {'%s__gte' % date_field: naive_result}
             ordering = date_field
 
-        qs = generic_view.get_queryset().filter(**lookup).order_by(ordering)
+        qs = generic_view.get_query_set().filter(**lookup).order_by(ordering)
 
         # Snag the first object from the queryset; if it doesn't exist that
         # means there's no next/previous link available.
diff --git a/django/views/generic/detail.py b/django/views/generic/detail.py
index 0495db0..68c25e2 100644
--- a/django/views/generic/detail.py
+++ b/django/views/generic/detail.py
@@ -26,7 +26,7 @@ class SingleObjectMixin(object):
         # Use a custom queryset if provided; this is required for subclasses
         # like DateDetailView
         if queryset is None:
-            queryset = self.get_queryset()
+            queryset = self.get_query_set()
 
         # Next, try looking up by primary key.
         pk = self.kwargs.get('pk', None)
@@ -52,7 +52,7 @@ class SingleObjectMixin(object):
                           {'verbose_name': queryset.model._meta.verbose_name})
         return obj
 
-    def get_queryset(self):
+    def get_query_set(self):
         """
         Get the queryset to look an object up against. May not be called if
         `get_object` is overridden.
diff --git a/django/views/generic/edit.py b/django/views/generic/edit.py
index ff87f7b..a5f037b 100644
--- a/django/views/generic/edit.py
+++ b/django/views/generic/edit.py
@@ -85,7 +85,7 @@ class ModelFormMixin(FormMixin, SingleObjectMixin):
             else:
                 # Try to get a queryset and extract the model class
                 # from that
-                model = self.get_queryset().model
+                model = self.get_query_set().model
             return model_forms.modelform_factory(model)
 
     def get_form_kwargs(self):
diff --git a/django/views/generic/list.py b/django/views/generic/list.py
index c50c055..95d83c8 100644
--- a/django/views/generic/list.py
+++ b/django/views/generic/list.py
@@ -16,7 +16,7 @@ class MultipleObjectMixin(object):
     context_object_name = None
     paginator_class = Paginator
 
-    def get_queryset(self):
+    def get_query_set(self):
         """
         Get the list of items for this view. This must be an interable, and may
         be a queryset (in which qs-specific behavior will be enabled).
@@ -113,7 +113,7 @@ class MultipleObjectMixin(object):
 
 class BaseListView(MultipleObjectMixin, View):
     def get(self, request, *args, **kwargs):
-        self.object_list = self.get_queryset()
+        self.object_list = self.get_query_set()
         allow_empty = self.get_allow_empty()
         if not allow_empty and len(self.object_list) == 0:
             raise Http404(_(u"Empty list and '%(class_name)s.allow_empty' is False.")