From: Daniel Martí <mvdan@mvdan.cc>
Date: Thu, 10 Sep 2015 02:08:24 +0000 (+0000)
Subject: Merge branch 'replace_optparse_with_argparse' into 'master'
X-Git-Tag: 0.5.0~118
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9489e80f09e3a9e882a2f6d4f91064858878ac5b;p=fdroidserver.git

Merge branch 'replace_optparse_with_argparse' into 'master'

replace deprecated optparse with argparse

squashed and rebased merge request fdroid/fdroidserver!74

following guidelines from:
https://docs.python.org/2/library/argparse.html#upgrading-optparse-code
except, still using option = parse.parse_args() instead of args = ...

- using the following script in folder fdroidserver:
	```
	for i in *.py; do
		sed -i -e 's/optparse/argparse/' \
			-e 's/OptionParser/ArgumentParser/' \
			-e 's/OptionError/ArgumentError/' \
			-e 's/add_option/add_argument/' \
			-e 's/(options, args) = parser/options = parser/' \
			-e 's/options, args = parser/options = parser/' \
			-e 's/Usage: %prog/%(prog)s/' $i;
	done
	```
- use ArgumentParser argument to replace (option, args) = parser.parse()
  call
- use parser.error(msg) instead of raise ArgumentException as suggested
  in https://docs.python.org/2/library/argparse.html#exiting-methods
- in fdroid catch ArgumentError instead of OptionError

See merge request !75
---

9489e80f09e3a9e882a2f6d4f91064858878ac5b