improve test coverage

Author: chfw

.moban.d/travis.yml

@@ -1,6 +1,7 @@
 {% extends "travis.yml.jj2" %}
 {%block custom_python_versions%}
 python:
+  - pypy
   - 3.6
   - 3.5
   - 3.4

.travis.yml

@@ -3,6 +3,7 @@ language: python
 notifications:
   email: false
 python:
+  - pypy
   - 3.6
   - 3.5
   - 3.4

docs/source/_static/single_xy_cosinus.svg

@@ -91,12 +91,12 @@ def render_sheet(self, sheet, title=DEFAULT_TITLE,
                      height_in_column=0, start_in_column=1,
                      stop_in_column=2,
                      **keywords):
-        histograms = zip(sheet.column[height_in_column],
-                         sheet.column[start_in_column],
-                         sheet.column[stop_in_column])
         cls = getattr(pygal, self._chart_class)
         instance = cls(title=title, **keywords)
-        instance.add(sheet.name, histograms)
+        self._render_a_sheet(instance, sheet,
+                             height_in_column=height_in_column,
+                             start_in_column=start_in_column,
+                             stop_in_column=stop_in_column)
         chart_content = instance.render()
         return chart_content
 
@@ -108,15 +108,23 @@ def render_book(self, book, title=DEFAULT_TITLE,
         cls = getattr(pygal, self._chart_class)
         instance = cls(title=title, **keywords)
         for sheet in to_book(book):
-            histograms = zip(sheet.column[height_in_column],
-                             sheet.column[start_in_column],
-                             sheet.column[stop_in_column])
-            if PY2 is False:
-                histograms = list(histograms)
-            instance.add(sheet.name, histograms)
+            self._render_a_sheet(instance, sheet,
+                                 height_in_column=height_in_column,
+                                 start_in_column=start_in_column,
+                                 stop_in_column=stop_in_column)
         chart_content = instance.render()
         return chart_content
 
+    def _render_a_sheet(self, instance, sheet,
+                        height_in_column=0, start_in_column=1,
+                        stop_in_column=2):
+        histograms = zip(sheet.column[height_in_column],
+                         sheet.column[start_in_column],
+                         sheet.column[stop_in_column])
+        if PY2 is False:
+            histograms = list(histograms)
+        instance.add(sheet.name, histograms)
+
 
 @PluginInfo('chart', tags=['xy'])
 class XY(Chart):
@@ -127,6 +135,9 @@ def render_sheet(self, sheet, title=DEFAULT_TITLE,
                      **keywords):
         cls = getattr(pygal, self._chart_class)
         instance = cls(title=title, **keywords)
+        self._render_a_sheet(instance, sheet,
+                             x_in_column=x_in_column,
+                             y_in_column=y_in_column)
         points = zip(sheet.column[x_in_column],
                      sheet.column[y_in_column])
         instance.add(sheet.name, points)
@@ -141,14 +152,22 @@ def render_book(self, book, title=DEFAULT_TITLE,
         cls = getattr(pygal, self._chart_class)
         instance = cls(title=title, **keywords)
         for sheet in to_book(book):
-            points = zip(sheet.column[x_in_column],
-                         sheet.column[y_in_column])
-            if not PY2:
-                points = list(points)
-            instance.add(sheet.name, points)
+            self._render_a_sheet(instance, sheet,
+                                 x_in_column=x_in_column,
+                                 y_in_column=y_in_column)
         chart_content = instance.render()
         return chart_content
 
+    def _render_a_sheet(self, instance, sheet,
+                        x_in_column=0,
+                        y_in_column=1):
+
+        points = zip(sheet.column[x_in_column],
+                     sheet.column[y_in_column])
+        if not PY2:
+            points = list(points)
+        instance.add(sheet.name, points)
+
 
 class ChartManager(PluginManager):
     def __init__(self):