Merge pull request plotly#363 from plotly/fix-offline-enterprise-url

chriddyp · chriddyp · commit 20102d6deec0 · 2015-12-01T09:46:53.000-05:00
🐛 get the correct plotly_domain, not the "session"'s
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,10 +4,29 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [1.9.2] - 2015-11-30
+**Bug Fix**: Previously, the "Export to plot.ly" link on
+offline charts would export your figures to the
+public plotly cloud, even if your `config_file`
+(set with `plotly.tools.set_config_file` to the file
+`~/.plotly/.config`) set `plotly_domain` to a plotly enterprise
+URL like `https://plotly.acme.com`.
+
+This is now fixed. Your graphs will be exported to your
+`plotly_domain` if it is set.
+
 ## [1.9.1] - 2015-11-26
 ### Added
-- The FigureFactory can now create annotated heatmaps with `.create_annotated_heatmap`.
+- The FigureFactory can now create annotated heatmaps with `.create_annotated_heatmap`. Check it out with:
+```
+import plotly.tools as tls
+help(tls.FigureFactory.create_annotated_heatmap)
+```
 - The FigureFactory can now create tables with `.create_table`.
+```
+import plotly.tools as tls
+help(tls.FigureFactory.create_table)
+```
 
 ## [1.9.0] - 2015-11-15
 - Previously, using plotly offline required a paid license.
diff --git a/plotly/offline/offline.py b/plotly/offline/offline.py
@@ -11,7 +11,8 @@
 import warnings
 from pkg_resources import resource_string
 
-from plotly import session, tools, utils
+import plotly
+from plotly import tools, utils
 from plotly.exceptions import PlotlyError
 
 
@@ -129,8 +130,10 @@ def iplot(figure_or_data, show_link=True, link_text='Export to plot.ly',
     config['linkText'] = link_text
     jconfig = json.dumps(config)
 
-    plotly_platform_url = session.get_session_config().get('plotly_domain',
-                                                           'https://plot.ly')
+    # TODO: The get_config 'source of truth' should
+    # really be somewhere other than plotly.plotly
+    plotly_platform_url = plotly.plotly.get_config().get('plotly_domain',
+                                                         'https://plot.ly')
     if (plotly_platform_url != 'https://plot.ly' and
             link_text == 'Export to plot.ly'):
 
diff --git a/plotly/version.py b/plotly/version.py
@@ -1 +1 @@
-__version__ = '1.9.1'
+__version__ = '1.9.2'

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = '1.9.1'`
	`1`	`+__version__ = '1.9.2'`