From 3fc741b09038765cb26a19c01c9040851dafaf57 Mon Sep 17 00:00:00 2001
From: q <q@moonq.org>
Date: Mon, 1 Oct 2018 22:10:27 +0300
Subject: [PATCH] other reporting tools py2/py3 compatibiliies

---
 bin/ansi-codes        |  2 +-
 reporting/ansi.py     |  2 +-
 reporting/md_color.py |  9 +++++----
 reporting/src2ans     | 20 +++++++++++---------
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/bin/ansi-codes b/bin/ansi-codes
index a1edef1..bca9b95 100755
--- a/bin/ansi-codes
+++ b/bin/ansi-codes
@@ -4,4 +4,4 @@ import sys,os
 sys.path.append(os.path.realpath(os.path.join(os.path.dirname(__file__),
                 "..","reporting")))
 import ansi
-ansi.demo()
+print(ansi.demo())
diff --git a/reporting/ansi.py b/reporting/ansi.py
index 58369e1..ef57e65 100644
--- a/reporting/ansi.py
+++ b/reporting/ansi.py
@@ -142,4 +142,4 @@ ${S}=====================${Z}
    C .left()  Left         y;xH .pos()       Absolute Position
    D .right() Right """
 
-    print(c.color_string(unformatted))
+    return(c.color_string(unformatted))
diff --git a/reporting/md_color.py b/reporting/md_color.py
index 53293b0..ca1f53b 100755
--- a/reporting/md_color.py
+++ b/reporting/md_color.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 import sys,os,re
-from argparse import ArgumentParser
+from argparse import ArgumentParser, RawDescriptionHelpFormatter
 sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 import ansi
 
@@ -16,12 +16,13 @@ def setup_options():
     usage = '''
 Markdown syntax color in ansi codes.
 Special syntaxes:
-Colors: insert string ${C}, where C is one of %s.
-Any ANSI control code:  ${3A}, ${1;34;42m}, etc..
+- Colors: insert string e.g. ${C}.
+- Any ANSI control code:  ${3A}, ${1;34;42m}, see the table..
 
-'''%(" ".join(bc.get_keys()))
+''' + ansi.demo()
 
     parser = ArgumentParser(
+        formatter_class = RawDescriptionHelpFormatter,
         description = usage,
         epilog = __author__
     )
diff --git a/reporting/src2ans b/reporting/src2ans
index 7d0cebc..634ba7b 100755
--- a/reporting/src2ans
+++ b/reporting/src2ans
@@ -23,7 +23,7 @@ __author__ = "Ville Rantanen <ville.q.rantanen@gmail.com>"
 __version__ = "0.1"
 
 import sys,os,argparse,re
-from argparse import ArgumentParser 
+from argparse import ArgumentParser
 sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 import ansi
 
@@ -32,10 +32,10 @@ def setup_options():
     usage='''
 Color notation renderer in ANSI codes
 Special syntaxes:
-    * Colors: insert string ${X}, where X is one of %s.
+    * Colors: insert string ${X}, where X values in the table below.
+
+''' + ansi.demo()
 
-'''%(" ".join(bc.get_keys()))
- 
     parser=ArgumentParser(description=usage,
                           formatter_class=argparse.RawDescriptionHelpFormatter,
                           epilog=__author__)
@@ -47,7 +47,7 @@ Special syntaxes:
                      help="Reset coloring at the end of each line.")
     parser.add_argument("-Z",action="store_false",dest="zero_final",default=True,
                      help="Disable reset of colors at the end of file.")
-    parser.add_argument("filename",type=str, 
+    parser.add_argument("filename",type=str,
                      help="File to show, - for stdin")
     opts=parser.parse_args()
     return opts
@@ -61,15 +61,17 @@ else:
 for row in f:
     if not row:
         continue
-    row=row.decode('utf-8').rstrip("\n\r ")
+    if type(row) == bytes:
+        row = row.decode('utf-8')
+    row=row.rstrip("\n\r ")
     if opts.color:
         colored=bc.color_string(row)
     else:
         colored=bc.nocolor_string(row)
-    sys.stdout.write(colored.encode('utf-8'))
+    sys.stdout.write(colored)
     if opts.zero and opts.color:
         sys.stdout.write(bc.Z)
     sys.stdout.write("\n")
 if opts.zero_final and opts.color:
-    sys.stdout.write(bc.Z.encode('utf-8'))
-    
+    sys.stdout.write(bc.Z)
+