Moved common functions in common.py

Author: Kirill V. Lyadvinsky

test/test_hobeta.py

@@ -16,8 +16,10 @@
 import unittest
 import tempfile
 from collections import namedtuple
+
 from zxtools import hobeta
-from zxtools import safe_parse_args
+from zxtools.common import safe_parse_args
+
 from mock import patch
 
 

test/test_zeus2txt.py

@@ -19,7 +19,7 @@
 from mock import patch
 
 from zxtools import zeus2txt
-from zxtools import safe_parse_args
+from zxtools.common import safe_parse_args
 
 
 

zxtools/__init__.py

@@ -7,35 +7,7 @@
 # Licensed under the BSD 3-Clause license.
 # See LICENSE file in the project root for full license information.
 #
-"""Global constants and templates are here"""
-
-import sys
-import logging
+"""Global constants"""
 
 __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/common.py

@@ -0,0 +1,37 @@
+#! /usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) 2016 Kirill V. Lyadvinsky
+# http://www.codeatcpp.com
+# Licensed under the BSD 3-Clause license.
+# See LICENSE file in the project root for full license information.
+#
+""" Common functions """
+
+import sys
+import logging
+
+
+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

@@ -16,7 +16,7 @@
 import argparse
 
 from zxtools import CHUNK_SIZE
-from zxtools import default_main
+from zxtools.common import default_main
 
 HEADER_FMT = '<8sBHHBBH'
 Header = namedtuple(

zxtools/zeus2txt.py

@@ -14,7 +14,7 @@
 import io
 
 from zxtools import CHUNK_SIZE
-from zxtools import default_main
+from zxtools.common import default_main
 
 CODE_ALIGN_WIDTH = 35