part of chris' comments

Author: Kully

CHANGELOG.md

@@ -2,7 +2,7 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [2.1.1] - 2017-10-20
+## [2.2.0] - 2017-10-20
 ### Added
 - NEW Presentations API for Python! Run `help(plotly.presentation_objs.Presentations)` for help or check out the new [documentation](https://plot.ly/python/presentations-api/)
 

plotly/figure_factory/_scatterplot.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-from plotly import exceptions, optional_imports
+from plotly import colors, exceptions, optional_imports
 from plotly.figure_factory import utils
 from plotly.graph_objs import graph_objs
 from plotly.tools import make_subplots
@@ -386,9 +386,9 @@ def scatterplot_theme(dataframe, headers, diag, size, height, width, title,
 
         # Convert colormap to list of n RGB tuples
         if colormap_type == 'seq':
-            foo = utils.color_parser(colormap, utils.unlabel_rgb)
+            foo = colors.color_parser(colormap, colors.unlabel_rgb)
             foo = utils.n_colors(foo[0], foo[1], n_colors_len)
-            theme = utils.color_parser(foo, utils.label_rgb)
+            theme = colors.color_parser(foo, colors.label_rgb)
 
         if colormap_type == 'cat':
             # leave list of colors the same way
@@ -556,9 +556,9 @@ def scatterplot_theme(dataframe, headers, diag, size, height, width, title,
 
             # Convert colormap to list of n RGB tuples
             if colormap_type == 'seq':
-                foo = utils.color_parser(colormap, utils.unlabel_rgb)
+                foo = colors.color_parser(colormap, colors.unlabel_rgb)
                 foo = utils.n_colors(foo[0], foo[1], len(intervals))
-                theme = utils.color_parser(foo, utils.label_rgb)
+                theme = colors.color_parser(foo, colors.label_rgb)
 
             if colormap_type == 'cat':
                 # leave list of colors the same way

plotly/plotly/plotly.py

@@ -47,6 +47,11 @@
     'sharing': files.FILE_CONTENT[files.CONFIG_FILE]['sharing']
 }
 
+SHARING_ERROR_MSG = (
+    "Whoops, sharing can only be set to either 'public', 'private', or "
+    "'secret'."
+)
+
 # test file permissions and make sure nothing is corrupted
 tools.ensure_local_plotly_files()
 
@@ -1530,28 +1535,31 @@ def upload(cls, presentation, filename, sharing='public', auto_open=True):
         Function for uploading presentations to Plotly.
 
         :param (dict) presentation: the JSON presentation to be uploaded. Use
-            plotly.presentation_objs.Presentation to create the presentation
-            from a string.
+            plotly.presentation_objs.Presentation to create presentations
+            from a Markdown-like string.
         :param (str) filename: the name of the presentation to be saved in
             your Plotly account. Will overwrite a presentation of the same
             name if it already exists in your files.
         :param (str) sharing: can be set to either 'public', 'private'
             or 'secret'. If 'public', your presentation will be viewable by
             all other users. If 'private' only you can see your presentation.
-            If 'secret', the url will be returned with a sharekey appended
-            to the url. Anyone with the url may view the presentation.
+            If it is set to 'secret', the url will be returned with a string
+            of random characters appended to the url which is called a
+            sharekey. The point of a sharekey is that it makes the url very
+            hard to guess, but anyone with the url can view the presentation.
         :param (bool) auto_open: automatically opens the presentation in the
             browser.
 
         See the documentation online for examples.
         """
         if sharing == 'public':
             world_readable = True
-        elif sharing == 'private':
-            world_readable = False
-        elif sharing == 'secret':
+        elif sharing in ['private', 'secret']:
             world_readable = False
-
+        else:
+            raise exceptions.PlotlyError(
+                SHARING_ERROR_MSG
+            )
         data = {
             'content': json.dumps(presentation),
             'filename': filename,
@@ -1561,6 +1569,7 @@ def upload(cls, presentation, filename, sharing='public', auto_open=True):
         # lookup if pre-existing filename already exists
         try:
             lookup_res = v2.files.lookup(filename)
+            lookup_res.raise_for_status()
             matching_file = json.loads(lookup_res.content)
 
             if matching_file['filetype'] != 'spectacle_presentation':
@@ -1783,8 +1792,7 @@ def create_animations(figure, filename=None, sharing='public', auto_open=True):
         body['share_key_enabled'] = True
     else:
         raise exceptions.PlotlyError(
-            "Whoops, sharing can only be set to either 'public', 'private', "
-            "or 'secret'."
+            SHARING_ERROR_MSG
         )
 
     response = v2.plots.create(body)