[Python-modules-commits] [python-django-extra-views] 02/11: Import python-django-extra-views_0.9.0.orig.tar.gz
Michael Fladischer
fladi at moszumanska.debian.org
Thu Mar 16 10:36:27 UTC 2017
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository python-django-extra-views.
commit bf9f58450cc0a79d5d76cd24eba7fc6d72815255
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Thu Mar 16 10:55:12 2017 +0100
Import python-django-extra-views_0.9.0.orig.tar.gz
---
.travis.yml | 6 +-----
CHANGELOG.rst | 7 +++++++
extra_views/formsets.py | 10 ++++++----
runtests.py | 4 ++++
setup.py | 2 +-
tox.ini | 8 ++++----
6 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 43e9fa8..f20b0e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,21 +7,17 @@ python:
- "3.5"
env:
- - DJANGO=django16
- DJANGO=django17
- DJANGO=django18
- DJANGO=django19
+ - DJANGO=django110
- DJANGO=djangomaster
matrix:
exclude:
- python: "3.4"
- env: DJANGO=django16
- - python: "3.4"
env: DJANGO=django17
- python: "3.5"
- env: DJANGO=django16
- - python: "3.5"
env: DJANGO=django17
allow_failures:
- env: DJANGO=djangomaster
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e2938a5..be95ed4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,13 @@
Change History
==============
+0.9.0 (2017-03-08)
+------------------
+This version supports Django 1.7, 1.8, 1.9, 1.10 (latest minor versions), and Python 2.7, 3.4, 3.5 (latest minor versions).
+
+- Added Django 1.10 support
+- Dropped Django 1.6 support
+
0.8 (2016-06-14)
----------------
diff --git a/extra_views/formsets.py b/extra_views/formsets.py
index d4b0de3..b4d50e4 100644
--- a/extra_views/formsets.py
+++ b/extra_views/formsets.py
@@ -1,3 +1,6 @@
+from functools import partial
+from functools import wraps
+
import django
from django.views.generic.base import TemplateResponseMixin, View, ContextMixin
from django.http import HttpResponseRedirect
@@ -6,7 +9,6 @@ from django.forms.models import modelformset_factory, inlineformset_factory
from django.views.generic.detail import SingleObjectMixin, SingleObjectTemplateResponseMixin
from django.views.generic.list import MultipleObjectMixin, MultipleObjectTemplateResponseMixin
from django.forms.models import BaseInlineFormSet
-from django.utils.functional import curry
class BaseFormSetMixin(object):
@@ -34,7 +36,7 @@ class BaseFormSetMixin(object):
# Hack to let as pass additional kwargs to each forms constructor. Be aware that this
# doesn't let us provide *different* arguments for each form
if extra_form_kwargs:
- formset_class.form = staticmethod(curry(formset_class.form, **extra_form_kwargs))
+ formset_class.form = wraps(formset_class.form)(partial(formset_class.form, **extra_form_kwargs))
return formset_class(**self.get_formset_kwargs())
@@ -147,7 +149,7 @@ class ModelFormSetMixin(FormSetMixin, MultipleObjectMixin):
fields = None
formfield_callback = None
widgets = None
-
+
def get_context_data(self, **kwargs):
"""
If an object list has been supplied, inject it into the context with the
@@ -155,7 +157,7 @@ class ModelFormSetMixin(FormSetMixin, MultipleObjectMixin):
"""
context = {}
- if self.object_list:
+ if self.object_list is not None:
context['object_list'] = self.object_list
context_object_name = self.get_context_object_name(self.object_list)
if context_object_name:
diff --git a/runtests.py b/runtests.py
index 0dfbe0d..c92e4f0 100755
--- a/runtests.py
+++ b/runtests.py
@@ -12,6 +12,10 @@ def configure(nose_args=None):
if not settings.configured:
settings.configure(
DATABASES={'default': {'ENGINE': 'django.db.backends.sqlite3'}},
+ TEMPLATES=[{
+ 'BACKEND': 'django.template.backends.django.DjangoTemplates',
+ 'APP_DIRS': True,
+ }],
INSTALLED_APPS=[
'django.contrib.contenttypes',
'django.contrib.auth',
diff --git a/setup.py b/setup.py
index d4e6861..7dc8aa3 100755
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup
setup(
name='django-extra-views',
- version='0.8.0',
+ version='0.9.0',
url='https://github.com/AndrewIngram/django-extra-views',
install_requires=[
'Django >=1.6',
diff --git a/tox.ini b/tox.ini
index ab0a5ec..8ed6b7c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
-envlist = py{26,27}-django{16,17,18,19}
- py{34,35}-django{18,19}
+envlist = py{27}-django{17,18,19,110}
+ py{34,35}-django{18,19,110}
py{27,34,35}-djangomaster
docs
@@ -13,10 +13,10 @@ commands =
deps =
coverage
django-nose
- django16: Django>=1.6,<1.7
django17: Django>=1.7,<1.8
django18: Django>=1.8,<1.9
- django19: Django>=1.9rc1,<1.10
+ django19: Django>=1.9,<1.10
+ django110: Django>=1.10,<1.11
djangomaster: https://github.com/django/django/archive/master.tar.gz
[testenv:docs]
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django-extra-views.git
More information about the Python-modules-commits
mailing list