Merge branch 'master' into master

Author: glamp

README.md

@@ -41,9 +41,11 @@ If you want to use bashplotlib from python, just import histogram and scatterplo
 from bashplotlib.scatterplot import plot_scatter
 ```
 <img src="examples/img/scatterplothelp.png">
+
 ```
 from bashplotlib.histogram import plot_hist
 ```
+
 <img src="examples/img/histogramhelp.png">
 
 ## examples

bashplotlib/histogram.py

@@ -42,8 +42,9 @@ def read_numbers(numbers):
         for number in numbers:
             yield float(str(number).strip())
     else:
-        for number in open(numbers):
-            yield float(number.strip())
+        with open(numbers) as fh:
+            for number in fh:
+                yield float(number.strip())
 
 
 def run_demo():
@@ -106,7 +107,8 @@ def plot_hist(f, height=20.0, bincount=None, binwidth=None, pch="o", colour="def
         pch = "o"
 
     if isinstance(f, str):
-        f = open(f).readlines()
+        with open(f) as fh:
+            f = fh.readlines()
 
     min_val, max_val = None, None
     n, mean, sd = 0.0, 0.0, 0.0
@@ -182,11 +184,12 @@ def plot_hist(f, height=20.0, bincount=None, binwidth=None, pch="o", colour="def
     print(" " * (nlen + 1) + "-" * len(xs))
 
     if xlab:
-        xlen = len(str(float((max_y) / height) + max_y))
+        labels = abbreviate([str(b) for b in bins])
+        xlen = len(labels[0])
         for i in range(0, xlen):
             printcolour(" " * (nlen + 1), True, colour)
             for x in range(0, len(hist)):
-                num = str(bins[x])
+                num = labels[x]
                 if x % 2 != 0:
                     pass
                 elif i < len(num):

bashplotlib/scatterplot.py

@@ -65,18 +65,21 @@ def plot_scatter(f, xs, ys, size, pch, colour, title):
     cs = None
     if f:
         if isinstance(f, str):
-            f = open(f)
-
-        data = [tuple(line.strip().split(',')) for line in f]
+            with open(f) as fh:
+                data = [tuple(line.strip().split(',')) for line in fh]
+        else:
+            data = [tuple(line.strip().split(',')) for line in f]
         xs = [float(i[0]) for i in data]
         ys = [float(i[1]) for i in data]
         if len(data[0]) > 2:
             cs = [i[2].strip() for i in data]
     elif isinstance(xs, list) and isinstance(ys, list):
         pass
     else:
-        xs = [float(str(row).strip()) for row in open(xs)]
-        ys = [float(str(row).strip()) for row in open(ys)]
+        with open(xs) as fh:
+            xs = [float(str(row).strip()) for row in fh]
+        with open(ys) as fh:
+            ys = [float(str(row).strip()) for row in fh]
 
     _plot_scatter(xs, ys, size, pch, colour, title, cs)
 

bashplotlib/utils/helpers.py

@@ -64,6 +64,18 @@ def drange(start, stop, step=1.0, include_stop=False):
             r = round(r, 10)
 
 
+def abbreviate(labels, rfill=' '):
+    """
+    Abbreviate labels without introducing ambiguities.
+    """
+    max_len = max(len(l) for l in labels)
+    for i in range(1, max_len):
+        abbrev = [l[:i].ljust(i, rfill) for l in labels]
+        if len(abbrev) == len(set(abbrev)):
+            break
+    return abbrev
+
+
 def box_text(text, width, offset=0):
     """
     Return text inside an ascii textbox

examples/sample.sh

@@ -22,6 +22,9 @@ hist --file "${dir}/data/exp.txt" --colour blue
 echo 'changing the shape of the point'
 hist --file "${dir}/data/exp.txt" --pch .
 
+echo 'adding x-labels'
+hist --file "${dir}/data/exp.txt" --pch . --xlab
+
 #echo 'using stdin'
 #curl -sL https://dl.dropbox.com/u/49171662/example.txt | hist
 

setup.py

@@ -2,6 +2,9 @@
 
 from setuptools import find_packages, setup
 
+with open("README.rst") as fh:
+    long_description = fh.read()
+
 setup(
     name="bashplotlib",
     version="0.6.5",
@@ -11,7 +14,7 @@
     license="BSD",
     packages=find_packages(),
     description="plotting in the terminal",
-    long_description=open("README.rst").read(),
+    long_description=long_description,
     entry_points = {
         'console_scripts': [
             'hist=bashplotlib.histogram:main',