Use entry point since we already use setuptools

Author: myint

Makefile

@@ -1,13 +1,13 @@
 check:
-	pep8 unify unify.py setup.py
-	pep257 unify unify.py setup.py
+	pep8 unify.py setup.py
+	pep257 unify.py setup.py
 	pylint \
 		--reports=no \
 		--disable=invalid-name \
 		--rcfile=/dev/null \
 		unify.py setup.py
 	python setup.py --long-description | rst2html --strict > /dev/null
-	scspell unify unify.py setup.py test_unify.py README.rst
+	scspell unify.py setup.py test_unify.py README.rst
 
 coverage:
 	@rm -f .coverage

setup.py

@@ -33,6 +33,7 @@ def version():
                        'License :: OSI Approved :: MIT License'],
           keywords='strings, formatter, style',
           py_modules=['unify'],
-          scripts=['unify'],
+          entry_points={
+              'console_scripts': ['unify = unify:main']},
           install_requires=['untokenize'],
           test_suite='test_unify')

test_unify.py

@@ -70,7 +70,7 @@ def test_diff(self):
     x = "abc"
 ''') as filename:
             output_file = io.StringIO()
-            unify.main(argv=['my_fake_program', filename],
+            unify._main(argv=['my_fake_program', filename],
                        standard_out=output_file,
                        standard_error=None)
             self.assertEqual('''\
@@ -83,7 +83,7 @@ def test_diff(self):
     def test_diff_with_empty_file(self):
         with temporary_file('') as filename:
             output_file = io.StringIO()
-            unify.main(argv=['my_fake_program', filename],
+            unify._main(argv=['my_fake_program', filename],
                        standard_out=output_file,
                        standard_error=None)
             self.assertEqual(
@@ -96,7 +96,7 @@ def test_in_place(self):
     x = "abc"
 ''') as filename:
             output_file = io.StringIO()
-            unify.main(argv=['my_fake_program', '--in-place', filename],
+            unify._main(argv=['my_fake_program', '--in-place', filename],
                        standard_out=output_file,
                        standard_error=None)
             with open(filename) as f:
@@ -116,7 +116,7 @@ def test_ignore_hidden_directories(self):
 """, directory=inner_directory):
 
                     output_file = io.StringIO()
-                    unify.main(argv=['my_fake_program',
+                    unify._main(argv=['my_fake_program',
                                      '--recursive',
                                      directory],
                                standard_out=output_file,

unify

@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 # Copyright (C) 2013 Steven Myint
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -27,6 +29,8 @@
 
 import io
 import os
+import signal
+import sys
 import tokenize
 
 import untokenize
@@ -141,8 +145,12 @@ def format_file(filename, args, standard_out):
             standard_out.write('\n'.join(list(diff) + ['']))
 
 
-def main(argv, standard_out, standard_error):
-    """Main entry point."""
+def _main(argv, standard_out, standard_error):
+    """Return exit status.
+
+    0 means no error.
+
+    """
     import argparse
     parser = argparse.ArgumentParser(description=__doc__, prog='unify')
     parser.add_argument('-i', '--in-place', action='store_true',
@@ -172,3 +180,24 @@ def main(argv, standard_out, standard_error):
                 format_file(name, args=args, standard_out=standard_out)
             except IOError as exception:
                 print(unicode(exception), file=standard_error)
+
+
+def main():
+    """Main entry point."""
+    try:
+        # Exit on broken pipe.
+        signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+    except AttributeError:  # pragma: no cover
+        # SIGPIPE is not available on Windows.
+        pass
+
+    try:
+        return _main(sys.argv,
+                     standard_out=sys.stdout,
+                     standard_error=sys.stderr)
+    except KeyboardInterrupt:  # pragma: no cover
+        return 2  # pragma: no cover
+
+
+if __name__ == '__main__':
+    sys.exit(main())