Merge branch 'master' of github.com:plotly/python-api into fix-pandas-serialization

Author: chriddyp

README.rst

@@ -107,9 +107,9 @@ License: MIT
 .. _Plotly: https://plot.ly
 .. _Quickstart: https://plot.ly/python
 .. _GitHub repo: https://github.com/plotly/python-api
-.. _Plotly and mpld3: http://nbviewer.ipython.org/github/plotly/python-user-guide/blob/master/s6_matplotlylib/s6_matplotlylib.ipynb
-.. _Plotly and Python: http://nbviewer.ipython.org/github/plotly/python-user-guide/blob/master/s0_getting-started/s0_getting-started.ipynb
-.. _set of notebooks: http://nbviewer.ipython.org/github/plotly/python-user-guide/blob/master/s00_homepage/s00_homepage.ipynb
+.. _Plotly and mpld3: https://plot.ly/python/matplotlib-to-plotly-tutorial/
+.. _Plotly and Python: https://plot.ly/python/overview/
+.. _set of notebooks: https://plot.ly/python/user-guide/
 .. _plotly profile: https://plot.ly/~mpld3/
 .. _@plotlygraphs: https://twitter.com/plotlygraphs
 .. _[email protected]: [email protected]

optional-requirements.txt

@@ -5,11 +5,17 @@
 ###                                                             ###
 ###################################################################
 
+## numpy (technically, this is covered by matplotlib's deps) ##
+numpy
+
 ## matplotlylib dependencies ##
 matplotlib==1.3.1
 
 ## testing dependencies ##
 nose==1.3.3
 
 ## ipython dependencies ##
-ipython[all]
+ipython[all]
+
+## pandas deps for some matplotlib functionality ##
+pandas

plotly/exceptions.py

@@ -16,6 +16,7 @@
 
 """
 import json
+import six
 
 ## Base Plotly Error ##
 
@@ -36,7 +37,9 @@ def __init__(self, requests_exception):
         if 'json' in content_type:
             content = requests_exception.response.content
             if content != '':
-                res_payload = json.loads(requests_exception.response.content)
+                res_payload = json.loads(
+                    requests_exception.response.content.decode('utf8')
+                )
                 if 'detail' in res_payload:
                     self.message = res_payload['detail']
                 else:

plotly/graph_objs/graph_objs.py

@@ -215,7 +215,7 @@ def to_string(self, level=0, indent=4, eol='\n',
 
         Example:
 
-            print obj.to_string()
+            print(obj.to_string())
 
         Keyword arguments:
         level (default = 0) -- set number of indentations to start with
@@ -323,14 +323,14 @@ def __setitem__(self, key, value):
         return super(PlotlyDict, self).__setitem__(key, value)
 
     def _assign_id_to_src(self, src_name, src_value):
-        if isinstance(src_value, basestring):
+        if isinstance(src_value, six.string_types):
             src_id = src_value
         else:
             try:
                 src_id = src_value.id
             except:
-                err = ("{} does not have an `id` property. "
-                       "{} needs to be assigned to either an "
+                err = ("{0} does not have an `id` property. "
+                       "{1} needs to be assigned to either an "
                        "object with an `id` (like a "
                        "plotly.grid_objs.Column) or a string. "
                        "The `id` is a unique identifier "
@@ -430,7 +430,7 @@ def strip_style(self):
                         elif not hasattr(self[key], '__iter__'):
                             del self[key]
                 except KeyError:  # TODO: Update the JSON
-                    # print "'type' not in {0} for {1}".format(obj_key, key)
+                    # print("'type' not in {0} for {1}".format(obj_key, key))
                     pass
 
     def get_data(self):
@@ -605,7 +605,7 @@ def to_string(self, level=0, indent=4, eol='\n',
 
         Example:
 
-            print obj.to_string()
+            print(obj.to_string())
 
         Keyword arguments:
         level (default = 0) -- set number of indentations to start with
@@ -759,7 +759,7 @@ def to_string(self, level=0, indent=4, eol='\n',
 
         Example:
 
-            print obj.to_string()
+            print(obj.to_string())
 
         Keyword arguments:
         level (default = 0) -- set number of indentations to start with
@@ -962,7 +962,7 @@ def to_string(self, level=0, indent=4, eol='\n',
 
         Example:
 
-            print obj.to_string()
+            print(obj.to_string())
 
         Keyword arguments:
         level (default = 0) -- set number of indentations to start with

plotly/matplotlylib/mpltools.py

@@ -422,13 +422,17 @@ def prep_ticks(ax, index, ax_type, props):
     if ax_type == 'x' and 'DateFormatter' in formatter:
         axis_dict['type'] = 'date'
         try:
-            axis_dict['tick0'] = mpl_dates_to_datestrings(axis_dict['tick0'])
+            axis_dict['tick0'] = mpl_dates_to_datestrings(
+                axis_dict['tick0'], formatter
+            )
         except KeyError:
             pass
         finally:
             axis_dict.pop('dtick', None)
             axis_dict.pop('autotick', None)
-            axis_dict['range'] = mpl_dates_to_datestrings(props['xlim'])
+            axis_dict['range'] = mpl_dates_to_datestrings(
+                props['xlim'], formatter
+            )
 
     if formatter == 'LogFormatterMathtext':
         axis_dict['exponentformat'] = 'e'
@@ -457,22 +461,39 @@ def prep_xy_axis(ax, props, x_bounds, y_bounds):
     return xaxis, yaxis
 
 
-def mpl_dates_to_datestrings(mpl_dates, format_string="%Y-%m-%d %H:%M:%S"):
-    """Convert matplotlib dates to formatted datestrings for plotly.
+def mpl_dates_to_datestrings(dates, mpl_formatter):
+    """Convert matplotlib dates to iso-formatted-like time strings.
+
+    Plotly's accepted format: "YYYY-MM-DD HH:MM:SS" (e.g., 2001-01-01 00:00:00)
 
     Info on mpl dates: http://matplotlib.org/api/dates_api.html
 
     """
-    try:
-        date_times = matplotlib.dates.num2date(mpl_dates, tz=pytz.utc)
-        time_strings = [date_time.strftime(format_string)
-                        for date_time in date_times]
-        if len(time_strings) > 1:
-            return time_strings
-        else:
-            return time_strings[0]
-    except TypeError:
-        return mpl_dates
+    _dates = dates
+
+    # this is a pandas datetime formatter, times show up in floating point days
+    # since the epoch (1970-01-01T00:00:00+00:00)
+    if mpl_formatter == "TimeSeries_DateFormatter":
+        try:
+            dates = matplotlib.dates.epoch2num(
+                [date*24*60*60 for date in dates]
+            )
+            dates = matplotlib.dates.num2date(dates, tz=pytz.utc)
+        except:
+            return _dates
+
+    # the rest of mpl dates are in floating point days since
+    # (0001-01-01T00:00:00+00:00) + 1. I.e., (0001-01-01T00:00:00+00:00) == 1.0
+    # according to mpl --> try num2date(1)
+    else:
+        try:
+            dates = matplotlib.dates.num2date(dates, tz=pytz.utc)
+        except:
+            return _dates
+
+    time_stings = [' '.join(date.isoformat().split('+')[0].split('T'))
+                   for date in dates]
+    return time_stings
 
 
 DASH_MAP = {

plotly/matplotlylib/renderer.py

@@ -258,7 +258,9 @@ def draw_bar(self, coll):
                                            [bar['x1'] for bar in trace])
             if self.x_is_mpl_date:
                 x = [bar['x0'] for bar in trace]
-                x = mpltools.mpl_dates_to_datestrings(x)
+                formatter = (self.current_mpl_ax.get_xaxis()
+                             .get_major_formatter().__class__.__name__)
+                x = mpltools.mpl_dates_to_datestrings(x, formatter)
         else:
             self.msg += "    Attempting to draw a horizontal bar chart\n"
             old_rights = [bar_props['x1'] for bar_props in trace]
@@ -367,8 +369,10 @@ def draw_marked_line(self, **props):
                 line=line,
                 marker=marker)
             if self.x_is_mpl_date:
+                formatter = (self.current_mpl_ax.get_xaxis()
+                             .get_major_formatter().__class__.__name__)
                 marked_line['x'] = mpltools.mpl_dates_to_datestrings(
-                    marked_line['x']
+                    marked_line['x'], formatter
                 )
             self.plotly_fig['data'] += marked_line,
             self.msg += "    Heck yeah, I drew that line\n"