Merge branch 'master' of https://github.com/plotly/plotly.py into bump_pjs_1290

Author: cldougl

contributing.md

@@ -12,7 +12,7 @@ Open an issue! Go to https://github.com/plotly/plotly.py/issues. It's possible t
 
 ## Have Questions about Plotly?
 
-Check out our Support App: https://support.plot.ly/libraries/python or Community Forum: https://community.plot.ly/. 
+Check out our Support App: https://support.plot.ly/libraries/python or Community Forum: https://community.plot.ly/.
 
 ## Setup
 
@@ -194,6 +194,8 @@ You're *strongly* encouraged to write tests that check your added functionality.
 
 When you write a new test anywhere under the `tests` directory, if your PR gets accepted, that test will run in a virtual machine to ensure that future changes don't break your contributions!
 
+Test accounts include: `PythonTest`, `PlotlyImageTest`, and  `PlotlyStageTest`. 
+
 #### Publishing to Pip
 
 You'll need the credentials file `~/.pypirc`. Request access from @theengineear and @chriddyp. Then, from inside the repository:

plotly/tests/test_core/temp-plot.html

@@ -110,7 +110,7 @@ def setUp(self):
         super(PlotlyOfflineOtherDomainTestCase, self).setUp()
         plotly.tools.set_config_file(plotly_domain='https://stage.plot.ly',
                                      plotly_api_domain='https://api-stage.plot.ly')
-        plotly.plotly.sign_in('PlotlyTestShark', 'YVsAvsGcGVxw11ct6Dff')
+        plotly.plotly.sign_in('PlotlyStageTest', 'rs3GA48WfFKUX4JpVL07')
 
     def test_plot_rendered_if_non_plotly_domain(self):
         html = plotly.offline.plot(fig, output_type='div')

plotly/tests/test_core/test_offline/test_offline.py

@@ -100,24 +100,24 @@ py.file_ops.delete(file_path=None, fid=None, url=None)
 ### Appearance and Access
 
 ```python
->> print Column([1,2,3], 'column 1')
+>> print(Column([1,2,3], 'column 1'))
 <Column "column 1": [1, 2, 3]>
 ```
 
 ```python
->> print Grid(col1, col2)
+>> print(Grid(col1, col2))
 <Grid: [<Column "column 1": [1, 2, 3]>, <Column "column 2": ["a", "b", "c"]>]>
 ```
 
 ```python
 >> grid = Grid(col1, col2)
->> print grid[0]
+>> print(grid[0])
 <Column "column 1": [1, 2, 3]>
 ```
 
 ```python
 >> grid = Grid(col1, col2)
->> print grid.get_column('column 1')
+>> print(grid.get_column('column 1'))
 <Column "column 1": [1, 2, 3]>
 ```
 
@@ -130,7 +130,7 @@ If you have the grid
 >> grid.upload(grid, 'experimental data')
 
 >> fig_data = [Scatter(xsrc=grid[0], ysrc=grid[0])]
->> print Scatter(xsrc=grid[0], ysrc=grid[1])
+>> print(Scatter(xsrc=grid[0], ysrc=grid[1]))
 [{"xsrc": "chris/8:3dkb", "ysrc": "chris/8:cbk8", "type": "scatter"}]
 >> py.plot(fig_data)
 
@@ -145,7 +145,7 @@ If you have the grid
 >>  Scatter(x=grid[0], y=grid[1])
 "PlotlyTypeException: Yikes, column objects aren't currently supported here."
 "x must be an array of strings, numbers, or datetimes."
->> print Scatter(xsrc=grid[0], yscr=grid[1])
+>> print(Scatter(xsrc=grid[0], yscr=grid[1]))
 {"xsrc": "chris/3:3dfbk", "ysrc": "chris/3:dk3c"}
 ```