Refactored to support Python3 and PEP-8 adjustments

Author: asbjorn

bashplotlib/histogram.py

@@ -6,6 +6,8 @@
 """
 
 from __future__ import print_function
+from __future__ import division
+
 import os
 import sys
 import math
@@ -147,7 +149,7 @@ def plot_hist(f, height=20.0, bincount=None, binwidth=None, pch="o", colour="def
 
     if title:
         print(box_text(title, max(len(hist) * 2, len(title)), nlen))
-    print
+    print()
 
     used_labs = set()
     for y in ys:
@@ -165,7 +167,7 @@ def plot_hist(f, height=20.0, bincount=None, binwidth=None, pch="o", colour="def
                 printcolour(pch, True, colour)
             else:
                 printcolour(" ", True, colour)
-        print()
+        print('')
     xs = hist.keys()
 
     print(" " * (nlen + 1) + "-" * len(xs))
@@ -182,7 +184,7 @@ def plot_hist(f, height=20.0, bincount=None, binwidth=None, pch="o", colour="def
                     print(num[i], end=' ')
                 else:
                     print(" ", end=' ')
-            print
+            print('')
 
     center = max(map(len, map(str, [n, min_val, mean, max_val])))
     center += 15

bashplotlib/scatterplot.py

@@ -5,22 +5,23 @@
 Plotting terminal based scatterplots
 """
 
+from __future__ import print_function
 import csv
 import sys
 import optparse
 from .utils.helpers import *
-from .utils.commandhelp import scatter 
+from .utils.commandhelp import scatter
 
 
 def get_scale(series, is_y=False, steps=20):
     min_val = min(series)
     max_val = max(series)
     scaled_series = []
-    for x in drange(min_val, max_val, (max_val-min_val)/steps):
+    for x in drange(min_val, max_val, (max_val - min_val) / steps):
         if x > 0 and scaled_series and max(scaled_series) < 0:
             scaled_series.append(0.0)
         scaled_series.append(x)
-    
+
     if is_y:
         scaled_series.reverse()
     return scaled_series
@@ -29,21 +30,21 @@ def get_scale(series, is_y=False, steps=20):
 def plot_scatter(f, xs, ys, size, pch, colour, title):
     """
     Form a complex number.
-    
+
     Arguments:
         f -- comma delimited file w/ x,y coordinates
         xs -- if f not specified this is a file w/ x coordinates
         ys -- if f not specified this is a filew / y coordinates
         size -- size of the plot
         pch -- shape of the points (any character)
         colour -- colour of the points
-        title -- title of the plot 
+        title -- title of the plot
     """
-    
+
     if f:
         if isinstance(f, str):
             f = open(f)
-        
+
         data = [tuple(map(float, line.strip().split(','))) for line in f]
         xs = [i[0] for i in data]
         ys = [i[1] for i in data]
@@ -52,29 +53,29 @@ def plot_scatter(f, xs, ys, size, pch, colour, title):
         ys = [float(str(row).strip()) for row in open(ys)]
 
     plotted = set()
-    
+
     if title:
-        print box_text(title, 2*len(get_scale(xs, False, size))+1)
-    
-    print "-" * (2*len(get_scale(xs, False, size))+2)
+        print(box_text(title, 2 * len(get_scale(xs, False, size)) + 1))
+
+    print("-" * (2 * len(get_scale(xs, False, size)) + 2))
     for y in get_scale(ys, True, size):
-        print "|",
+        print("|", end=' ')
         for x in get_scale(xs, False, size):
             point = " "
             for (i, (xp, yp)) in enumerate(zip(xs, ys)):
                 if xp <= x and yp >= y and (xp, yp) not in plotted:
                     point = pch
-                    #point = str(i) 
+                    #point = str(i)
                     plotted.add((xp, yp))
-            if x==0 and y==0:
+            if x == 0 and y == 0:
                 point = "o"
-            elif x==0:
+            elif x == 0:
                 point = "|"
-            elif y==0:
+            elif y == 0:
                 point = "-"
             printcolour(point, True, colour)
-        print "|"
-    print "-"*(2*len(get_scale(xs, False, size))+2)
+        print("|")
+    print("-" * (2 * len(get_scale(xs, False, size)) + 2))
 
 
 def main():
@@ -85,9 +86,10 @@ def main():
     parser.add_option('-t', '--title', help='title for the chart', default="", dest='t')
     parser.add_option('-x', help='x coordinates', default=None, dest='x')
     parser.add_option('-y', help='y coordinates', default=None, dest='y')
-    parser.add_option('-s', '--size',help='y coordinates', default=20, dest='size', type='int')
-    parser.add_option('-p', '--pch',help='shape of point', default="x", dest='pch') 
-    parser.add_option('-c', '--colour', help='colour of the plot (%s)' % colour_help, default='default', dest='colour')
+    parser.add_option('-s', '--size', help='y coordinates', default=20, dest='size', type='int')
+    parser.add_option('-p', '--pch', help='shape of point', default="x", dest='pch')
+    parser.add_option('-c', '--colour', help='colour of the plot (%s)' %
+                      colour_help, default='default', dest='colour')
 
     opts, args = parser.parse_args()
 
@@ -97,8 +99,8 @@ def main():
     if opts.f or (opts.x and opts.y):
         plot_scatter(opts.f, opts.x, opts.y, opts.size, opts.pch, opts.colour, opts.t)
     else:
-        print "nothing to plot!"
+        print("nothing to plot!")
 
 
-if __name__=="__main__":
+if __name__ == "__main__":
     main()