Code structure fixes

Removal of 'optional' on deprecated arguments, using only 'ver' for version numbers, removal of unnecessary parentheses.
apel · Sep 11, 2024 · 6e623eb · 6e623eb
1 parent dc79b3f
commit 6e623eb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/bin/receiver.py b/bin/receiver.py
@@ -41,16 +41,15 @@ def main():
                                   '%s' % default_conf_location,
                             default=default_conf_location)
     arg_parser.add_argument('-l', '--log_config',
-                            help='DEPRECATED - location of logging config '
-                                 'file (optional)',
+                            help='DEPRECATED - location of logging config file',
                             default=None)
     arg_parser.add_argument('-d', '--dn_file',
                             help='location of the file containing valid DNs, '
                                   'default path: %s' % default_dns_location,
                             default=default_dns_location)
     arg_parser.add_argument('-v', '--version',
                             action='version',
-                            version='ver: %s' % ver)
+                            version=ver)
 
     # Using the vars function to output a dict-like view rather than Namespace object.
     options = vars(arg_parser.parse_args())

diff --git a/bin/sender.py b/bin/sender.py
@@ -36,16 +36,15 @@ def main():
     arg_parser = ArgumentParser(description=__doc__)
 
     arg_parser.add_argument('-c', '--config',
-                            help=('location of config file, default path: '
-                                  '%s' % default_conf_location),
+                            help='location of config file, default path: '
+                                  '%s' % default_conf_location,
                             default=default_conf_location)
     arg_parser.add_argument('-l', '--log_config',
-                            help='DEPRECATED - location of logging config'
-                                 'file (optional)',
+                            help='DEPRECATED - location of logging config file',
                             default=None)
     arg_parser.add_argument('-v', '--version',
                             action='version',
-                            version='ver: %s' % ver)
+                            version=ver)
 
     # Using the vars function to output a dict-like view rather than Namespace object.
     options = vars(arg_parser.parse_args())