Fix issues with django 1.10 and 1.11

Author: GaretJax

djclick/adapter.py

@@ -5,15 +5,33 @@
 
 import click
 
-from django import get_version
+from django import get_version, VERSION as DJANGO_VERSION
 from django.core.management import CommandError
 
 
-class ParserAdapter(object):
+class OptionParseAdapter(object):
     def parse_args(self, args):
         return (self, None)
 
 
+class ArgumentParserDefaults(object):
+    def __init__(self, args):
+        self._args = args
+
+    def _get_kwargs(self):
+        return {
+            'args': self._args,
+        }
+
+
+class ArgumentParserAdapter(object):
+    def __init__(self):
+        self._actions = []
+
+    def parse_args(self, args):
+        return ArgumentParserDefaults(args)
+
+
 class DjangoCommandMixin(object):
     use_argparse = False
     option_list = []
@@ -38,7 +56,10 @@ def create_parser(self, progname, subcommand):
         """
         Called when run through `call_command`.
         """
-        return ParserAdapter()
+        if DJANGO_VERSION >= (1, 10):
+            return ArgumentParserAdapter()
+        else:
+            return OptionParseAdapter()
 
     def print_help(self, prog_name, subcommand):
         self.main(['--help'], standalone_mode=False)

djclick/test/test_adapter.py

@@ -184,7 +184,7 @@ def test_django_color(capsys):
 
 def test_django_help(manage):
     # The -h/--help switches cause the program to exit. Invoking the command
-    # through execute_from_command_line would cause the test suit to exit as
+    # through execute_from_command_line would cause the test suite to exit as
     # well... this means that we have to call it in a subprocess.
     helps = [
         manage('helpcmd', '-h'),