output module

[imago.git] / imago_pack / imago.py

diff --git a/imago_pack/imago.py b/imago_pack/imago.py
index 33e7c69..c31db64 100755 (executable)
--- a/imago_pack/imago.py
+++ b/imago_pack/imago.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
 #!/usr/bin/env python
 

-"""Go image recognition"""
+"""Go image recognition."""

 
 import sys
 import os
 
 import sys
 import os


@@ -19,9 +19,7 @@ import manual
 import intrsc
 import gridf
 
 import intrsc
 import gridf
 

-def main():
-    """Main function of the program."""
-    
+def argument_parser():

     parser = argparse.ArgumentParser(description=__doc__)
     parser.add_argument('files', metavar='file', nargs='+',
                         help="image to analyse")
     parser = argparse.ArgumentParser(description=__doc__)
     parser.add_argument('files', metavar='file', nargs='+',
                         help="image to analyse")


@@ -39,6 +37,13 @@ def main():
                         help="use cached lines")
     parser.add_argument('-v', '--verbose', dest='verbose', action='store_true',
                         help="report progress")
                         help="use cached lines")
     parser.add_argument('-v', '--verbose', dest='verbose', action='store_true',
                         help="report progress")

+    return parser
+ 
+
+def main():
+    """Main function of the program."""
+    
+    parser = argument_parser()

     args = parser.parse_args()
 
     show_all = args.show_all
     args = parser.parse_args()
 
     show_all = args.show_all


@@ -97,8 +102,7 @@ def main():
     board = intrsc.board(image, lines, show_all, do_something)
 
     #simple ASCII output:
     board = intrsc.board(image, lines, show_all, do_something)
 
     #simple ASCII output:

-    for line in board:
-        print ' '.join(line)
+    print board

     
     if len(args.files) > 1:
         for f in args.files[1:]:
     
     if len(args.files) > 1:
         for f in args.files[1:]:


@@ -133,6 +137,6 @@ class Imsave():
 if __name__ == '__main__':
     try:
         sys.exit(main())
 if __name__ == '__main__':
     try:
         sys.exit(main())

-    except KeyboardInterrupt:
+    except KeyboardInterrupt: #TODO does this work?

         print "Interrupted."
         print "Interrupted."

-        sys.exit()
+        sys.exit(1)