[Python-modules-commits] [python-mplexporter] 72/135: Merge branch 'master' into plotly

[Wolfgang Borgert]

This is an automated email from the git hooks/post-receive script.

debacle pushed a commit to branch master
in repository python-mplexporter.

commit 82d3025576a5d0dafcc430ff82792ac54cd422c4
Merge: 5adc25f 8110822
Author: theengineear <andseier at gmail.com>
Date:   Sun Mar 2 17:44:07 2014 -0800

    Merge branch 'master' into plotly
    
    Conflicts:
    	mplexporter/renderers/plotly/plotly_renderer.py

 mplexporter/exporter.py                         | 132 ++++++++++++++----------
 mplexporter/renderers/base.py                   |   5 +-
 mplexporter/renderers/plotly/plotly_renderer.py |   1 -
 mplexporter/utils.py                            |  28 ++---
 4 files changed, 92 insertions(+), 74 deletions(-)

diff --cc mplexporter/renderers/plotly/plotly_renderer.py
index c637b0e,20a8e2a..926869f
--- a/mplexporter/renderers/plotly/plotly_renderer.py
+++ b/mplexporter/renderers/plotly/plotly_renderer.py
@@@ -1,18 -1,10 +1,17 @@@
  """
 -Plotly Renderer
 -================
 -This is a renderer class to be used with an exporter for rendering plots in Plotly!
 +Plotly Renderer.
 +
 +A renderer class to be used with an exporter for rendering matplotlib plots
 +in Plotly.
 +
 +Attributes:
 +    PlotlyRenderer -- a renderer class to be used with an Exporter obj
 +    fig_to_plotly -- a function to send an mpl figure to Plotly
 +
  """
- 
  from . import plotly_utils
  from .. base import Renderer
 +from ... import utils
  from ... exporter import Exporter
  
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-mplexporter.git