From 6cc9ebfb673f17ff165e90cb276fb84e057609bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Ryannel?= Date: Wed, 29 Aug 2018 17:18:22 +0200 Subject: [PATCH] Added support for django 2.1 * in django>=2.1 cmd was removed as parameter to add_parser * add tox support for django >= 2.1 * introduce helper function to remove cmd paramter form add_parsers when django >= 2.1 * remove unecessary lines * fix issues when cmd may be missing in kwargs --- constance/management/commands/constance.py | 18 ++++++++++++++---- tox.ini | 2 ++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/constance/management/commands/constance.py b/constance/management/commands/constance.py index 2bc2809..0fc48f2 100644 --- a/constance/management/commands/constance.py +++ b/constance/management/commands/constance.py @@ -5,6 +5,8 @@ from __future__ import unicode_literals from django.core.exceptions import ValidationError from django.core.management import BaseCommand, CommandError from django.utils.translation import ugettext as _ +from django import VERSION + from ... import config from ...admin import ConstanceForm, get_values @@ -31,17 +33,25 @@ class Command(BaseCommand): def add_arguments(self, parser): subparsers = parser.add_subparsers(dest='command') + # API changed in Django>=2.1. cmd argument was removed. + parser_list = self._subparsers_add_parser(subparsers, 'list', cmd=self, help='list all Constance keys and their values') - parser_list = subparsers.add_parser('list', cmd=self, help='list all Constance keys and their values') - - parser_get = subparsers.add_parser('get', cmd=self, help='get the value of a Constance key') + parser_get = self._subparsers_add_parser(subparsers, 'get', cmd=self, help='get the value of a Constance key') parser_get.add_argument('key', help='name of the key to get', metavar='KEY') - parser_set = subparsers.add_parser('set', cmd=self, help='set the value of a Constance key') + parser_set = self._subparsers_add_parser(subparsers, 'set', cmd=self, help='set the value of a Constance key') parser_set.add_argument('key', help='name of the key to get', metavar='KEY') # use nargs='+' so that we pass a list to MultiValueField (eg SplitDateTimeField) parser_set.add_argument('value', help='value to set', metavar='VALUE', nargs='+') + + def _subparsers_add_parser(self, subparsers, name, **kwargs): + # API in Django >= 2.1 changed and removed cmd parameter from add_parser + if VERSION >= (2, 1) and 'cmd' in kwargs: + kwargs.pop('cmd') + return subparsers.add_parser(name, **kwargs) + + def handle(self, command, key=None, value=None, *args, **options): if command == 'get': diff --git a/tox.ini b/tox.ini index e2a8531..fe331d8 100644 --- a/tox.ini +++ b/tox.ini @@ -5,6 +5,7 @@ envlist = py{27,34,35,py}-django-110 py{27,34,35,36,py}-django-111 py{34,35,36}-django-20 + py{35,36,37}-django-21 py{35,36}-django-master [testenv] @@ -18,6 +19,7 @@ deps = django-110: Django>=1.10,<1.11 django-111: Django>=1.11,<2.0 django-20: Django>=2.0,<2.1 + django-21: Django>=2.1,<2.2 django-master: https://github.com/django/django/archive/master.tar.gz usedevelop = True ignore_outcome =