Skip to content

Commit

Permalink
Removing conditionals which only apply to unsupported Django versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
mlavin committed Jan 24, 2016
1 parent 694c929 commit 1db4b87
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 26 deletions.
5 changes: 1 addition & 4 deletions selectable/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,7 @@ def get_query(self, request, term):
return qs

def get_queryset(self):
try:
qs = self.model._default_manager.get_queryset()
except AttributeError: # Django <= 1.5.
qs = self.model._default_manager.get_query_set()
qs = self.model._default_manager.get_queryset()
if self.filters:
qs = qs.filter(**self.filters)
return qs
Expand Down
25 changes: 3 additions & 22 deletions selectable/forms/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import json

from django import forms, VERSION as DJANGO_VERSION
from django import forms
from django.conf import settings
from django.forms.utils import flatatt
from django.utils.encoding import force_text
Expand Down Expand Up @@ -66,15 +66,6 @@ class SelectableMultiWidget(forms.MultiWidget):
def update_query_parameters(self, qs_dict):
self.widgets[0].update_query_parameters(qs_dict)

if DJANGO_VERSION < (1, 6):
def _has_changed(self, initial, data):
"Detects if the widget was changed. This is removed in Django 1.6."
if initial is None and data is None:
return False
if data and not hasattr(data, '__iter__'):
data = self.decompress(data)
return super(SelectableMultiWidget, self)._has_changed(initial, data)

def decompress(self, value):
if value:
lookup = self.lookup_class()
Expand Down Expand Up @@ -164,7 +155,8 @@ def __init__(self, lookup_class, *args, **kwargs):

def render(self, name, value, attrs=None, choices=()):
lookup = self.lookup_class()
if value is None: value = []
if value is None:
value = []
final_attrs = self.build_attrs(attrs, type=self.input_type, name=name)
id_ = final_attrs.get('id', None)
inputs = []
Expand Down Expand Up @@ -232,17 +224,6 @@ def render(self, name, value, attrs=None):
value = ['', value]
return super(_BaseMultipleSelectWidget, self).render(name, value, attrs)

if DJANGO_VERSION < (1, 6):
def _has_changed(self, initial, data):
""""
Detects if the widget was changed. This is removed in Django 1.6.
For the multi-select case we only care if the hidden inputs changed.
"""
initial = ['', initial]
data = ['', data]
return super(_BaseMultipleSelectWidget, self)._has_changed(initial, data)


class AutoCompleteSelectMultipleWidget(_BaseMultipleSelectWidget):

Expand Down

0 comments on commit 1db4b87

Please sign in to comment.