Skip to content

Commit

Permalink
fix to make it work with django 1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Craston committed Apr 21, 2015
1 parent 632f7ef commit f2ace9e
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions django_maven/management/commands/maven.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,13 @@ def usage(self, subcommand):
return usage

def create_parser(self, prog_name, subcommand, subcommand_class):
return OptionParser(prog=prog_name,
usage=subcommand_class.usage(subcommand),
version=subcommand_class.get_version(),
option_list=subcommand_class.option_list)
if not self.use_argparse:
return OptionParser(prog=prog_name,
usage=subcommand_class.usage(subcommand),
version=subcommand_class.get_version(),
option_list=subcommand_class.option_list)
else:
return super(Command, self).create_parser(prog_name, subcommand)

def run_from_argv(self, argv):
if len(argv) <= 2 or argv[2] in ['-h', '--help']:
Expand All @@ -47,7 +50,12 @@ def run_from_argv(self, argv):

subcommand_class = self._get_subcommand_class(argv[2])
parser = self.create_parser(argv[0], argv[2], subcommand_class)
options, args = parser.parse_args(argv[3:])
if self.use_argparse:
options = parser.parse_args(argv[3:])
cmd_options = vars(options)
args = cmd_options.pop('args', ())
else:
options, args = parser.parse_args(argv[3:])
handle_default_options(options)
try:
subcommand_class.execute(*args, **options.__dict__)
Expand Down

0 comments on commit f2ace9e

Please sign in to comment.