From cea8f0b8cc86332b0643acd62f24f9fef2ecc153 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 14 Jan 2014 14:18:06 +1000 Subject: [PATCH] Drop the argparse requirement for make-event-names.py We only take one option (path to linux/input.h) anyway so drop the argparse requirement. This way libevdev builds on RHEL6 too which doesn't ship argparse. Signed-off-by: Peter Hutterer Reviewed-by: Benjamin Tissoires --- configure.ac | 2 -- libevdev/make-event-names.py | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 57cd56c..fa24c03 100644 --- a/configure.ac +++ b/configure.ac @@ -117,8 +117,6 @@ AS_IF([test "x$enable_gcov" != "xno"], ) AM_PATH_PYTHON([2.6]) -AS_IF([$($PYTHON -c "import argparse")], [:], - AC_MSG_ERROR([python argparse module is missing])) AM_CONDITIONAL([GCOV_ENABLED], [test "x$enable_gcov" != "xno"]) AC_SUBST([GCOV_CFLAGS]) diff --git a/libevdev/make-event-names.py b/libevdev/make-event-names.py index ab643f7..149f093 100755 --- a/libevdev/make-event-names.py +++ b/libevdev/make-event-names.py @@ -7,7 +7,6 @@ from __future__ import print_function import re import sys -import argparse class Bits(object): pass @@ -190,12 +189,14 @@ def parse(fp): return bits -if __name__ == "__main__": - parser = argparse.ArgumentParser() - parser.add_argument('source', metavar="/path/to/linux/input.h", - type=argparse.FileType('r'), - help='source file to parse') +def usage(prog): + print("Usage: %s /path/to/linux/input.h" % prog) - args = parser.parse_args(sys.argv[1:]) - bits = parse(args.source) - print_mapping_table(bits) +if __name__ == "__main__": + if len(sys.argv) != 2: + usage(sys.argv[0]) + sys.exit(2) + + with open(sys.argv[1]) as f: + bits = parse(f) + print_mapping_table(bits)