diff --git a/fdroidserver/__main__.py b/fdroidserver/__main__.py index 00c19e35..14813fa1 100755 --- a/fdroidserver/__main__.py +++ b/fdroidserver/__main__.py @@ -182,7 +182,7 @@ def main(): "can not be specified at the same time.")) sys.exit(1) - # Trick optparse into displaying the right usage when --help is used. + # Trick argparse into displaying the right usage when --help is used. sys.argv[0] += ' ' + command del sys.argv[1] diff --git a/tests/build.TestCase b/tests/build.TestCase index 3ad4cdd0..0228bf35 100755 --- a/tests/build.TestCase +++ b/tests/build.TestCase @@ -4,7 +4,6 @@ import inspect import logging -import optparse import os import shutil import sys @@ -1104,15 +1103,17 @@ class BuildTest(unittest.TestCase): if __name__ == "__main__": os.chdir(os.path.dirname(__file__)) - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (fdroidserver.common.options, args) = parser.parse_args(['--verbose']) + fdroidserver.common.options = parser.parse_args(['--verbose']) newSuite = unittest.TestSuite() newSuite.addTest(unittest.makeSuite(BuildTest)) diff --git a/tests/checkupdates.TestCase b/tests/checkupdates.TestCase index 972f1eef..0ae895de 100755 --- a/tests/checkupdates.TestCase +++ b/tests/checkupdates.TestCase @@ -3,7 +3,6 @@ # http://www.drdobbs.com/testing/unit-testing-with-python/240165163 import logging -import optparse import os import sys import unittest @@ -336,15 +335,17 @@ class CheckupdatesTest(unittest.TestCase): if __name__ == "__main__": - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (fdroidserver.common.options, args) = parser.parse_args(['--verbose']) + fdroidserver.common.options = parser.parse_args(['--verbose']) newSuite = unittest.TestSuite() newSuite.addTest(unittest.makeSuite(CheckupdatesTest)) diff --git a/tests/common.TestCase b/tests/common.TestCase index a162826e..b3e32100 100755 --- a/tests/common.TestCase +++ b/tests/common.TestCase @@ -9,7 +9,6 @@ import importlib import inspect import json import logging -import optparse import os import re import ruamel.yaml @@ -22,6 +21,7 @@ import unittest import textwrap import yaml import gzip +from argparse import ArgumentParser from zipfile import BadZipFile, ZipFile from unittest import mock from pathlib import Path @@ -3294,15 +3294,15 @@ class ConfigOptionsScopeTest(unittest.TestCase): if __name__ == "__main__": os.chdir(os.path.dirname(__file__)) - parser = optparse.OptionParser() - parser.add_option( + parser = ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (fdroidserver.common.options, args) = parser.parse_args(['--verbose']) + fdroidserver.common.options = parser.parse_args(['--verbose']) newSuite = unittest.TestSuite() newSuite.addTest(unittest.makeSuite(CommonTest)) diff --git a/tests/deploy.TestCase b/tests/deploy.TestCase index fd17d062..f2082dd3 100755 --- a/tests/deploy.TestCase +++ b/tests/deploy.TestCase @@ -2,7 +2,6 @@ import inspect import logging -import optparse import os import sys import tempfile @@ -390,15 +389,17 @@ class DeployTest(unittest.TestCase): if __name__ == "__main__": os.chdir(os.path.dirname(__file__)) - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (fdroidserver.common.options, args) = parser.parse_args(['--verbose']) + fdroidserver.common.options = parser.parse_args(['--verbose']) newSuite = unittest.TestSuite() newSuite.addTest(unittest.makeSuite(DeployTest)) diff --git a/tests/exception.TestCase b/tests/exception.TestCase index a1d8a992..bfa44f57 100755 --- a/tests/exception.TestCase +++ b/tests/exception.TestCase @@ -3,7 +3,6 @@ # http://www.drdobbs.com/testing/unit-testing-with-python/240165163 import inspect -import optparse import os import sys import unittest @@ -57,15 +56,17 @@ class ExceptionTest(unittest.TestCase): if __name__ == "__main__": os.chdir(os.path.dirname(__file__)) - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (fdroidserver.exception.options, args) = parser.parse_args(['--verbose']) + fdroidserver.exception.options = parser.parse_args(['--verbose']) fdroidserver.common.options = fdroidserver.exception.options newSuite = unittest.TestSuite() diff --git a/tests/gpgsign.TestCase b/tests/gpgsign.TestCase index ef5ea007..27feb79e 100755 --- a/tests/gpgsign.TestCase +++ b/tests/gpgsign.TestCase @@ -3,7 +3,6 @@ import inspect import json import logging -import optparse import os import shutil import sys @@ -75,15 +74,17 @@ class GpgsignTest(unittest.TestCase): if __name__ == "__main__": os.chdir(os.path.dirname(__file__)) - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (common.options, args) = parser.parse_args(['--verbose']) + common.options = parser.parse_args(['--verbose']) newSuite = unittest.TestSuite() newSuite.addTest(unittest.makeSuite(GpgsignTest)) diff --git a/tests/import_subcommand.TestCase b/tests/import_subcommand.TestCase index eb41ae20..79222eab 100755 --- a/tests/import_subcommand.TestCase +++ b/tests/import_subcommand.TestCase @@ -4,7 +4,6 @@ import git import logging -import optparse import os import shutil import sys @@ -161,15 +160,17 @@ class ImportTest(unittest.TestCase): if __name__ == "__main__": - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (fdroidserver.common.options, args) = parser.parse_args(['--verbose']) + fdroidserver.common.options = parser.parse_args(['--verbose']) newSuite = unittest.TestSuite() newSuite.addTest(unittest.makeSuite(ImportTest)) diff --git a/tests/index.TestCase b/tests/index.TestCase index 3fb4a034..3e70acb1 100755 --- a/tests/index.TestCase +++ b/tests/index.TestCase @@ -5,7 +5,6 @@ import datetime import glob import inspect import logging -import optparse import os import sys import unittest @@ -942,15 +941,17 @@ class AltstoreIndexTest(unittest.TestCase): if __name__ == "__main__": os.chdir(os.path.dirname(__file__)) - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (options, args) = parser.parse_args(["--verbose"]) + options = parser.parse_args(["--verbose"]) Options.verbose = options.verbose newSuite = unittest.TestSuite() diff --git a/tests/init.TestCase b/tests/init.TestCase index 8e1042c3..9266fa7c 100755 --- a/tests/init.TestCase +++ b/tests/init.TestCase @@ -5,7 +5,6 @@ import inspect import logging import os -import optparse import shutil import sys import unittest @@ -75,15 +74,17 @@ class InitTest(unittest.TestCase): if __name__ == "__main__": os.chdir(os.path.dirname(__file__)) - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (fdroidserver.init.options, args) = parser.parse_args(['--verbose']) + fdroidserver.init.options = parser.parse_args(['--verbose']) newSuite = unittest.TestSuite() newSuite.addTest(unittest.makeSuite(InitTest)) diff --git a/tests/install.TestCase b/tests/install.TestCase index c2fad222..2f4569ea 100755 --- a/tests/install.TestCase +++ b/tests/install.TestCase @@ -3,7 +3,6 @@ # http://www.drdobbs.com/testing/unit-testing-with-python/240165163 import inspect -import optparse import os import sys import unittest @@ -38,15 +37,17 @@ class InstallTest(unittest.TestCase): if __name__ == "__main__": os.chdir(os.path.dirname(__file__)) - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (fdroidserver.install.options, args) = parser.parse_args(['--verbose']) + fdroidserver.install.options = parser.parse_args(['--verbose']) fdroidserver.common.options = fdroidserver.install.options newSuite = unittest.TestSuite() diff --git a/tests/lint.TestCase b/tests/lint.TestCase index 5dd94d4b..5430eb7b 100755 --- a/tests/lint.TestCase +++ b/tests/lint.TestCase @@ -3,7 +3,6 @@ # http://www.drdobbs.com/testing/unit-testing-with-python/240165163 import logging -import optparse import os import ruamel.yaml import shutil @@ -527,15 +526,17 @@ class LintAntiFeaturesTest(unittest.TestCase): if __name__ == "__main__": - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (fdroidserver.lint.options, args) = parser.parse_args(['--verbose']) + fdroidserver.lint.options = parser.parse_args(['--verbose']) fdroidserver.common.options = fdroidserver.lint.options newSuite = unittest.TestSuite() diff --git a/tests/main.TestCase b/tests/main.TestCase index 3809fe17..deaf9dff 100755 --- a/tests/main.TestCase +++ b/tests/main.TestCase @@ -1,7 +1,6 @@ #!/usr/bin/env python3 import inspect -import optparse import os import sys import pkgutil @@ -265,15 +264,17 @@ class MainTest(unittest.TestCase): if __name__ == "__main__": os.chdir(os.path.dirname(__file__)) - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (common.options, args) = parser.parse_args(['--verbose']) + common.options = parser.parse_args(['--verbose']) newSuite = unittest.TestSuite() newSuite.addTest(unittest.makeSuite(MainTest)) diff --git a/tests/metadata.TestCase b/tests/metadata.TestCase index c46d5bbf..c4c58882 100755 --- a/tests/metadata.TestCase +++ b/tests/metadata.TestCase @@ -3,7 +3,6 @@ import copy import io import logging -import optparse import os import random import ruamel.yaml @@ -2447,15 +2446,17 @@ class PostMetadataParseTest(unittest.TestCase): if __name__ == "__main__": - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (fdroidserver.common.options, args) = parser.parse_args(['--verbose']) + fdroidserver.common.options = parser.parse_args(['--verbose']) newSuite = unittest.TestSuite() newSuite.addTest(unittest.makeSuite(MetadataTest)) diff --git a/tests/net.TestCase b/tests/net.TestCase index 94b8ce84..59b299b8 100755 --- a/tests/net.TestCase +++ b/tests/net.TestCase @@ -2,7 +2,6 @@ import inspect import logging -import optparse import os import random import requests @@ -126,15 +125,17 @@ class NetTest(unittest.TestCase): if __name__ == "__main__": os.chdir(os.path.dirname(__file__)) - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (common.options, args) = parser.parse_args(['--verbose']) + common.options = parser.parse_args(['--verbose']) newSuite = unittest.TestSuite() newSuite.addTest(unittest.makeSuite(NetTest)) diff --git a/tests/nightly.TestCase b/tests/nightly.TestCase index 9e505c7f..7cb1712d 100755 --- a/tests/nightly.TestCase +++ b/tests/nightly.TestCase @@ -2,7 +2,6 @@ import inspect import logging -import optparse import os import requests import shutil @@ -364,15 +363,17 @@ class NightlyTest(unittest.TestCase): if __name__ == "__main__": os.chdir(os.path.dirname(__file__)) - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (common.options, args) = parser.parse_args(['--verbose']) + common.options = parser.parse_args(['--verbose']) newSuite = unittest.TestSuite() newSuite.addTest(unittest.makeSuite(NightlyTest)) diff --git a/tests/publish.TestCase b/tests/publish.TestCase index 80556744..00bbec0e 100755 --- a/tests/publish.TestCase +++ b/tests/publish.TestCase @@ -13,7 +13,6 @@ import inspect import json import logging -import optparse import os import shutil import sys @@ -413,15 +412,17 @@ class PublishTest(unittest.TestCase): if __name__ == "__main__": os.chdir(os.path.dirname(__file__)) - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (common.options, args) = parser.parse_args(['--verbose']) + common.options = parser.parse_args(['--verbose']) newSuite = unittest.TestSuite() newSuite.addTest(unittest.makeSuite(PublishTest)) diff --git a/tests/rewritemeta.TestCase b/tests/rewritemeta.TestCase index 9d20550f..00e4f354 100755 --- a/tests/rewritemeta.TestCase +++ b/tests/rewritemeta.TestCase @@ -1,7 +1,6 @@ #!/usr/bin/env python3 import logging -import optparse import os import sys import unittest @@ -265,15 +264,17 @@ class RewriteMetaTest(unittest.TestCase): if __name__ == "__main__": - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (common.options, args) = parser.parse_args(['--verbose']) + common.options = parser.parse_args(['--verbose']) newSuite = unittest.TestSuite() newSuite.addTest(unittest.makeSuite(RewriteMetaTest)) diff --git a/tests/scanner.TestCase b/tests/scanner.TestCase index 83ce75b7..9069164e 100755 --- a/tests/scanner.TestCase +++ b/tests/scanner.TestCase @@ -3,7 +3,6 @@ import glob import inspect import logging -import optparse import os import re import shutil @@ -815,15 +814,17 @@ class Test_main(unittest.TestCase): if __name__ == "__main__": os.chdir(os.path.dirname(__file__)) - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (fdroidserver.common.options, args) = parser.parse_args(['--verbose']) + fdroidserver.common.options = parser.parse_args(['--verbose']) newSuite = unittest.TestSuite() newSuite.addTests( diff --git a/tests/signatures.TestCase b/tests/signatures.TestCase index 4744613b..5d043a9f 100755 --- a/tests/signatures.TestCase +++ b/tests/signatures.TestCase @@ -1,7 +1,6 @@ #!/usr/bin/env python3 import inspect -import optparse import os import sys import unittest @@ -59,15 +58,17 @@ class SignaturesTest(unittest.TestCase): if __name__ == "__main__": os.chdir(os.path.dirname(__file__)) - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (common.options, args) = parser.parse_args(['--verbose']) + common.options = parser.parse_args(['--verbose']) newSuite = unittest.TestSuite() newSuite.addTest(unittest.makeSuite(SignaturesTest)) diff --git a/tests/signindex.TestCase b/tests/signindex.TestCase index 28afa689..7931fbdc 100755 --- a/tests/signindex.TestCase +++ b/tests/signindex.TestCase @@ -3,7 +3,6 @@ import inspect import json import logging -import optparse import os import shutil import subprocess @@ -193,15 +192,17 @@ class SignindexTest(unittest.TestCase): if __name__ == "__main__": os.chdir(os.path.dirname(__file__)) - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (common.options, args) = parser.parse_args(['--verbose']) + common.options = parser.parse_args(['--verbose']) newSuite = unittest.TestSuite() newSuite.addTest(unittest.makeSuite(SignindexTest)) diff --git a/tests/update.TestCase b/tests/update.TestCase index 0c692aa8..6af32bb2 100755 --- a/tests/update.TestCase +++ b/tests/update.TestCase @@ -9,7 +9,6 @@ import hashlib import inspect import json import logging -import optparse import os import random import shutil @@ -2271,15 +2270,17 @@ class TestParseFromPbxproj(unittest.TestCase): if __name__ == "__main__": os.chdir(os.path.dirname(__file__)) - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (fdroidserver.common.options, args) = parser.parse_args(['--verbose']) + fdroidserver.common.options = parser.parse_args(['--verbose']) newSuite = unittest.TestSuite() newSuite.addTest(unittest.makeSuite(UpdateTest)) diff --git a/tests/vcs.TestCase b/tests/vcs.TestCase index 2e46f926..99af14cc 100755 --- a/tests/vcs.TestCase +++ b/tests/vcs.TestCase @@ -4,7 +4,6 @@ import inspect import logging -import optparse import os import sys import unittest @@ -88,15 +87,17 @@ class VCSTest(unittest.TestCase): if __name__ == "__main__": os.chdir(os.path.dirname(__file__)) - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (fdroidserver.common.options, args) = parser.parse_args(['--verbose']) + fdroidserver.common.options = parser.parse_args(['--verbose']) newSuite = unittest.TestSuite() newSuite.addTest(unittest.makeSuite(VCSTest)) diff --git a/tests/verify.TestCase b/tests/verify.TestCase index 774e24fa..cd8fbb6e 100755 --- a/tests/verify.TestCase +++ b/tests/verify.TestCase @@ -3,7 +3,6 @@ import inspect import json import logging -import optparse import os import shutil import sys @@ -94,15 +93,17 @@ class VerifyTest(unittest.TestCase): if __name__ == "__main__": os.chdir(os.path.dirname(__file__)) - parser = optparse.OptionParser() - parser.add_option( + import argparse + + parser = argparse.ArgumentParser() + parser.add_argument( "-v", "--verbose", action="store_true", default=False, help="Spew out even more information than normal", ) - (common.options, args) = parser.parse_args(['--verbose']) + common.options = parser.parse_args(['--verbose']) newSuite = unittest.TestSuite() newSuite.addTest(unittest.makeSuite(VerifyTest))