[gentoo-commits] proj/gentoolkit:gentoolkit-dev commit in: src/ekeyword/

[Mike Frysinger]

commit:     c688fa044b7b5e8e72ae6e9cc7f54fc35e1ff0c1
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 07:12:52 2017 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 07:12:52 2017 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=c688fa04

ekeyword: change --version to use builtin version action

Minor clean up here.

 src/ekeyword/ekeyword.py          |  5 +----
 src/ekeyword/ekeyword_unittest.py | 11 ++++++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/ekeyword/ekeyword.py b/src/ekeyword/ekeyword.py
index e4a8197..a36dcd3 100755
--- a/src/ekeyword/ekeyword.py
+++ b/src/ekeyword/ekeyword.py
@@ -459,7 +459,7 @@ def get_parser():
        parser.add_argument('--format', default='auto', dest='style',
                choices=('auto', 'color-inline', 'inline', 'short-multi', 
'long-multi'),
                help='Selet output format for showing differences')
-       parser.add_argument('-V', '--version', default=False, 
action='store_true',
+       parser.add_argument('-V', '--version', action='version', 
version=VERSION,
                help='Show version information')
        return parser
 
@@ -493,9 +493,6 @@ def main(argv):
 
        parser = get_parser()
        opts = parser.parse_args(parse_args)
-       if opts.version:
-               print('version: %s' % VERSION)
-               return os.EX_OK
        if not work_args:
                parser.error('need arches/ebuilds to process')
 

diff --git a/src/ekeyword/ekeyword_unittest.py 
b/src/ekeyword/ekeyword_unittest.py
index 473113b..7b9017e 100755
--- a/src/ekeyword/ekeyword_unittest.py
+++ b/src/ekeyword/ekeyword_unittest.py
@@ -378,11 +378,16 @@ class TestMain(unittest.TestCase):
 
        def testSmoke(self):
                ekeyword.main(['arm', '--dry-run', os.path.join(TESTDIR, 
'process-1.ebuild')])
-               ekeyword.main(['--version', '--dry-run'])
+
+       def testVersion(self):
+               with self.assertRaises(SystemExit) as e:
+                       ekeyword.main(['--version', '--dry-run'])
+               self.assertEqual(e.exception.code, os.EX_OK)
 
        def testEmptyString(self):
-               self.assertRaises(SystemExit, ekeyword.main,
-                                 ['', os.path.join(TESTDIR, 
'process-1.ebuild')])
+               with self.assertRaises(SystemExit) as e:
+                       ekeyword.main(['', os.path.join(TESTDIR, 
'process-1.ebuild')])
+               self.assertNotEqual(e.exception.code, os.EX_OK)
 
 
 if __name__ == '__main__':