From 3649c0ccaff0be765a233beed0b46224d6ac021d Mon Sep 17 00:00:00 2001 From: jvoisin Date: Wed, 5 Sep 2018 17:48:14 +0200 Subject: [PATCH] Remove short version of dangerous/advanced options --- mat2 | 4 ++-- tests/test_climat2.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mat2 b/mat2 index c7f7a73..2a8ef46 100755 --- a/mat2 +++ b/mat2 @@ -37,11 +37,11 @@ def create_arg_parser(): version='MAT2 %s' % __version__) parser.add_argument('-l', '--list', action='store_true', help='list all supported fileformats') - parser.add_argument('-c', '--check-dependencies', action='store_true', + parser.add_argument('--check-dependencies', action='store_true', help='check if MAT2 has all the dependencies it needs') parser.add_argument('-V', '--verbose', action='store_true', help='show more verbose status information') - parser.add_argument('-u', '--unknown-members', metavar='policy', default='abort', + parser.add_argument('--unknown-members', metavar='policy', default='abort', help='how to handle unknown members of archive-style files ' + '(policy should be abort, omit, or keep)') diff --git a/tests/test_climat2.py b/tests/test_climat2.py index 9614347..7d12a03 100644 --- a/tests/test_climat2.py +++ b/tests/test_climat2.py @@ -8,14 +8,16 @@ class TestHelp(unittest.TestCase): def test_help(self): proc = subprocess.Popen(['./mat2', '--help'], stdout=subprocess.PIPE) stdout, _ = proc.communicate() - self.assertIn(b'usage: mat2 [-h] [-v] [-l] [-c] [-V] [-u policy] [-s | -L] [files [files ...]]', + self.assertIn(b'usage: mat2 [-h] [-v] [-l] [--check-dependencies] [-V]', stdout) + self.assertIn(b'[--unknown-members policy] [-s | -L]', stdout) def test_no_arg(self): proc = subprocess.Popen(['./mat2'], stdout=subprocess.PIPE) stdout, _ = proc.communicate() - self.assertIn(b'usage: mat2 [-h] [-v] [-l] [-c] [-V] [-u policy] [-s | -L] [files [files ...]]', + self.assertIn(b'usage: mat2 [-h] [-v] [-l] [--check-dependencies] [-V]', stdout) + self.assertIn(b'[--unknown-members policy] [-s | -L]', stdout) class TestVersion(unittest.TestCase):