Fix lint warnings

Author: jia3ep

.pylintrc

@@ -4,7 +4,7 @@ ignored-classes=Header
 [SIMILARITIES]
 
 # Minimum lines number of a similarity.
-min-similarity-lines=20
+min-similarity-lines=7
 
 [MISCELLANEOUS]
 # List of note tags to take in consideration, separated by a comma.

test/test_hobeta.py

@@ -17,26 +17,29 @@
 import tempfile
 from collections import namedtuple
 from zxtools import hobeta
+from zxtools import safe_parse_args
 
 
 class TestHobeta(unittest.TestCase):
     def test_args_parser(self):
+        args_parser = hobeta.create_parser()
         with self.assertRaises(SystemExit):
-            hobeta.parse_args(("-h", "-v"))
+            safe_parse_args(args_parser, ["-h", "-v"])
 
         with self.assertRaises(SystemExit):
-            hobeta.parse_args(())
+            safe_parse_args(args_parser, [])
 
         temp_in_file = tempfile.mkstemp()[1]
         input_file = open(temp_in_file, "w")
         input_file.close()
         temp_out_file = tempfile.mkstemp()[1]
         try:
-            args = hobeta.parse_args(("info", temp_in_file))
+            args = safe_parse_args(args_parser, ["info", temp_in_file])
             self.assertEqual(args.func, hobeta.show_info)
             args.hobeta_file.close()
 
-            args = hobeta.parse_args(("strip", temp_in_file, temp_out_file))
+            args = safe_parse_args(args_parser,
+                                   ["strip", temp_in_file, temp_out_file])
             self.assertEqual(args.func, hobeta.strip_header)
             args.hobeta_file.close()
             args.output_file.close()

test/test_zeus2txt.py

@@ -18,27 +18,30 @@
 import logging
 
 from zxtools import zeus2txt
+from zxtools import safe_parse_args
 
 
 class TestZeus2Txt(unittest.TestCase):
     def test_args_parser(self):
+        args_parser = zeus2txt.create_parser()
+
         with self.assertRaises(SystemExit):
-            zeus2txt.parse_args(("-h", "-v"))
+            safe_parse_args(args_parser, ["-h", "-v"])
 
         with self.assertRaises(SystemExit):
-            zeus2txt.parse_args(())
+            safe_parse_args(args_parser, [])
 
         temp_in_file = tempfile.mkstemp()[1]
         input_file = open(temp_in_file, "w")
         input_file.close()
         temp_out_file = tempfile.mkstemp()[1]
         try:
-            args = zeus2txt.parse_args(("info", temp_in_file))
+            args = safe_parse_args(args_parser, ["info", temp_in_file])
             self.assertEqual(args.func, zeus2txt.show_info)
             args.zeus_file.close()
 
-            args = zeus2txt.parse_args(("convert",
-                                        temp_in_file, temp_out_file))
+            args = safe_parse_args(args_parser,
+                                   ["convert", temp_in_file, temp_out_file])
             self.assertEqual(args.func, zeus2txt.convert_file)
             args.zeus_file.close()
             args.output_file.close()

zxtools/__init__.py

@@ -9,5 +9,33 @@
 #
 """ Global contants is here"""
 
+import sys
+import logging
+
 __version__ = '1.0.23'
 CHUNK_SIZE = 512 * 1024  # 512 KBytes
+
+
+def safe_parse_args(parser, args):
+    """Safely parse arguments"""
+    try:
+        options = parser.parse_args(args)
+        if len(args) == 0:
+            raise ValueError
+    except ValueError:
+        parser.print_help()
+        sys.exit(0)
+
+    return options
+
+
+def default_main(parser):
+    """ Default entry point implementation """
+    args = safe_parse_args(parser, sys.argv[1:])
+    if args.verbose:
+        logging.basicConfig(level=logging.DEBUG)
+
+    if hasattr(args, 'func'):
+        args.func(args)
+
+    return args

zxtools/hobeta.py

@@ -10,13 +10,13 @@
 """ Hobeta file utils """
 
 import os
-import sys
 import logging
 import struct
 from collections import namedtuple
 import argparse
 
 from zxtools import CHUNK_SIZE
+from zxtools import default_main
 
 HEADER_FMT = '<8sBHHBBH'
 Header = namedtuple(
@@ -121,7 +121,7 @@ def strip_header(parsed_args):
     return bytes_to_copy-length
 
 
-def parse_args(args):
+def create_parser():
     """ Parse command line arguments """
     parser = argparse.ArgumentParser(description="Hobeta files converter")
     parser.add_argument(
@@ -155,25 +155,12 @@ def parse_args(args):
         help="Show Hobeta header format description")
     help_parser.set_defaults(func=hobeta_help)
 
-    try:
-        options = parser.parse_args(args)
-        if len(args) == 0:
-            raise ValueError
-    except ValueError:
-        parser.print_help()
-        sys.exit(0)
-
-    return options
+    return parser
 
 
 def main():
-    """ Entry point """
-    args = parse_args(sys.argv[1:])
-    if args.verbose:
-        logging.basicConfig(level=logging.DEBUG)
-
-    if hasattr(args, 'func'):
-        args.func(args)
+    """Entry point"""
+    return default_main(create_parser())
 
 
 if __name__ == '__main__':

zxtools/zeus2txt.py

@@ -11,10 +11,10 @@
 
 import argparse
 import logging
-import sys
 import io
 
 from zxtools import CHUNK_SIZE
+from zxtools import default_main
 
 CODE_ALIGN_WIDTH = 35
 
@@ -109,7 +109,7 @@ def convert_file(parsed_args):
     output.close()
 
 
-def parse_args(args):
+def create_parser():
     """ Parse command line arguments """
     parser = argparse.ArgumentParser(
         description="Zeus Z80 assembler files converter")
@@ -140,25 +140,12 @@ def parse_args(args):
         action='store_true', help="Include original code in the output file")
     convert_parser.set_defaults(func=convert_file)
 
-    try:
-        options = parser.parse_args(args)
-        if len(args) == 0:
-            raise ValueError
-    except ValueError:
-        parser.print_help()
-        sys.exit(0)
-
-    return options
+    return parser
 
 
 def main():
-    """ Entry point """
-    args = parse_args(sys.argv[1:])
-    if args.verbose:
-        logging.basicConfig(level=logging.DEBUG)
-
-    if hasattr(args, 'func'):
-        args.func(args)
+    """Entry point"""
+    default_main(create_parser())
 
 
 if __name__ == '__main__':