updated to work w/ stdin

glamp · glamp · commit 8f7e0a8a2188 · 2013-01-27T20:57:14.000-05:00
diff --git a/bin/hist.py b/bin/hist.py
@@ -117,8 +117,11 @@ def plot_hist(f, height=20, bincount=None, pch="o", colour="white", title=""):
     (opts, args) = parser.parse_args()
     
     if opts.f is None:
-        opts.f = args[0]
-    
+        if len(args) > 0:
+            opts.f = args[0]
+        else:
+            opts.f = sys.stdin.readlines()
+
     if opts.f:
         plot_hist(opts.f, opts.h, opts.b, opts.p, opts.colour, opts.t)
     else:
diff --git a/bin/scatter.py b/bin/scatter.py
@@ -2,6 +2,7 @@
 import csv
 import optparse
 from utils.helpers import *
+import sys
 
 
 def get_scale(series, is_y=False, steps=20):
@@ -19,7 +20,10 @@ def get_scale(series, is_y=False, steps=20):
 
 def plot_scatter(f, xs, ys, size, pch, colour, title):
     if f:
-        data = [tuple(map(float, line)) for line in csv.reader(open(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]
     else:
@@ -73,6 +77,9 @@ def plot_scatter(f, xs, ys, size, pch, colour, title):
 
     (opts, args) = parser.parse_args()
 
+    if opts.f is None and (opts.x is None or opts.y is None):
+        opts.f = sys.stdin.readlines()
+
     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:
diff --git a/bin/test.py b/bin/test.py
@@ -0,0 +1,3 @@
+import sys
+data = sys.stdin.readlines()
+print "Counted", len(data), "lines."

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import sys`
	`2`	`+data = sys.stdin.readlines()`
	`3`	`+print "Counted", len(data), "lines."`