Removed explicit Django 1.2.X compatibility.

diff --git a/contrib/shipherd/templatetags/shipherd.py b/contrib/shipherd/templatetags/shipherd.py
index 6e36126..e3019e1 100644 (file)
--- a/contrib/shipherd/templatetags/shipherd.py
+++ b/contrib/shipherd/templatetags/shipherd.py
@@ -60,10 +60,6 @@ class LazyNavigationRecurser(object):
                        context['item'] = item
                        context['children'] = self.__class__(self.template_nodes, item.get_children(), context, request)
                        
-                       # Django 1.2.X compatibility - a lazy recurser will not be called if accessed as a template variable.
-                       if django_version < (1,3):
-                               context['children'] = context['children']()
-                       
                        # Then render the nodelist bit by bit.
                        for node in self.template_nodes:
                                bits.append(node.render(context))

diff --git a/models/fields/__init__.py b/models/fields/__init__.py
index d900e31..1f9603e 100644 (file)
--- a/models/fields/__init__.py
+++ b/models/fields/__init__.py
@@ -109,8 +109,7 @@ class SlugMultipleChoiceField(models.Field):
                                del kwargs[k]
                
                defaults.update(kwargs)
-               # Django 1.2 does not supply MultipleChoiceField
-               form_class = getattr(forms, 'TypedMultipleChoiceField', forms.MultipleChoiceField)
+               form_class = forms.TypedMultipleChoiceField
                return form_class(**defaults)
        
        def validate(self, value, model_instance):