Fix more cross references.

Author: tshead2

docs/conf.py

@@ -83,13 +83,13 @@ def __getattr__(cls, name):
 nitpicky = True
 
 nitpick_ignore = [
-#    ("py:class", "object"),
+    ("py:class", "QApplication"),
     ]
 
 intersphinx_mapping = {
     "arrow": ("https://arrow.readthedocs.org/en/latest", None),
     "numpy": ("http://docs.scipy.org/doc/numpy-1.10.1", None),
-    "python": ("https://docs.python.org/2.7", None),
+    "python": ("https://docs.python.org/3.5", None),
     "PIL": ("https://pillow.readthedocs.org/en/3.2.x", None),
     }
 

toyplot/data.py

@@ -284,7 +284,7 @@ def keys(self):
 
         Returns
         -------
-        keys: sequence of string column names.
+        keys: sequence of :class:`str` column names.
         """
         return self._columns.keys()
 
@@ -293,7 +293,7 @@ def values(self):
 
         Returns
         -------
-        values: sequence of numpy.ndarray columns.
+        values: sequence of :class:`numpy.ndarray` columns.
         """
         return self._columns.values()
 
@@ -307,7 +307,7 @@ def metadata(self, column):
 
         Returns
         -------
-        metadata: dict containing key-value pairs.
+        metadata: :class:`dict` containing key-value pairs.
         """
         if column not in self._columns:
             raise ValueError("Unknown column name '%s'" % column)

toyplot/png.py

@@ -36,9 +36,8 @@ def render(canvas, fobj=None, width=None, height=None, scale=None):
 
     Returns
     -------
-    png: PNG image data, or `None`
-      PNG representation of `canvas`, or `None` if the caller specifies the
-      `fobj` parameter.
+    png: :class:`bytes` containing PNG image data, or `None`
+      Returns `None` if the caller specifies the `fobj` parameter, returns the PNG image data otherwise.
 
     Notes
     -----
@@ -68,7 +67,7 @@ def render_frames(canvas, width=None, height=None, scale=None):
 
     Returns
     -------
-    frames: Python generator expression that returns each PNG image in the sequence.
+    frames: Sequence of :class:`bytes` objects containing PNG image data.
       The caller must iterate over the returned frames and is responsible for all
       subsequent processing, including disk I/O, video compression, etc.
 

toyplot/reportlab/png.py

@@ -48,9 +48,8 @@ def render(canvas, fobj=None, width=None, height=None, scale=None):
 
     Returns
     -------
-    png: PNG image data, or `None`
-      PNG representation of `canvas`, or `None` if the caller specifies the
-      `fobj` parameter.
+    png: :class:`bytes` containing PNG image data, or `None`
+      Returns `None` if the caller specifies the `fobj` parameter, returns the PNG image data otherwise.
     """
     svg = toyplot.svg.render(canvas)
     scale = canvas._point_scale(width=width, height=height, scale=scale)
@@ -111,7 +110,7 @@ def render_frames(canvas, width=None, height=None, scale=None):
 
     Returns
     -------
-    frames: Python generator expression that returns each PNG image in the sequence.
+    frames: Sequence of :class:`bytes` objects containing PNG image data.
       The caller must iterate over the returned frames and is responsible for all
       subsequent processing, including disk I/O, video compression, etc.