Made changes to support at least Django 1.3.

This commit is contained in:
Dirk Eschler 2012-10-24 20:56:01 +02:00
parent e38d6b8a62
commit d3e86f160b
4 changed files with 22 additions and 9 deletions

View file

@ -4,6 +4,7 @@ python:
- "2.6"
- "2.7"
env:
- DJANGO=1.3.4
- DJANGO=1.4.2
install:
- pip install -q Django==$DJANGO --use-mirrors

View file

@ -1028,10 +1028,19 @@ class TranslationAdminTest(ModeltranslationTestBase):
ma = TestModelAdmin(TestModel, self.site)
fieldsets = [('Test', {'fields': ['data_de', 'data_en']})]
self.assertEqual(
ma.get_inline_instances(request)[0].get_fieldsets(request),
fieldsets)
self.assertEqual(
ma.get_inline_instances(request)[0].get_fieldsets(
request, self.test_obj),
fieldsets)
try:
ma_fieldsets = ma.get_inline_instances(
request)[0].get_fieldsets(request)
except AttributeError: # Django 1.3 fallback
ma_fieldsets = ma.inlines[0](
TestModel, self.site).get_fieldsets(request)
self.assertEqual(ma_fieldsets, fieldsets)
try:
ma_fieldsets = ma.get_inline_instances(
request)[0].get_fieldsets(request, self.test_obj)
except AttributeError: # Django 1.3 fallback
ma_fieldsets = ma.inlines[0](
TestModel, self.site).get_fieldsets(request, self.test_obj)
self.assertEqual(ma_fieldsets, fieldsets)

View file

@ -1,5 +1,8 @@
# -*- coding: utf-8 -*-
from django.conf.urls import include, patterns, url
try:
from django.conf.urls import include, patterns, url
except ImportError: # Django 1.3 fallback
from django.conf.urls.defaults import include, patterns, url
from django.contrib import admin

View file

@ -22,7 +22,7 @@ setup(
'modeltranslation.management.commands'],
package_data={'modeltranslation': ['static/modeltranslation/css/*.css',
'static/modeltranslation/js/*.js']},
requires=['django(>=1.4)'],
requires=['django(>=1.3)'],
download_url='https://github.com/downloads/deschler/django-modeltranslation/django-modeltranslation-0.4.0-beta2.tar.gz',
classifiers=[
'Programming Language :: Python',