merge master into doc-prod

Author: nicolaskruchten

CHANGELOG.md

@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.4.1] - 2019-12-10
+
+### Fixed
+ - Fixed improper JSON encoding exception when the `pillow` module not installed [#1993](https://github.com/plotly/plotly.py/pull/1993)
+ 
 ## [4.4.0] - 2019-12-10
 
 ### Updated
@@ -22,8 +27,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added 
 
- - Extended the plotly.express functional API with .. new functions: `px.pie`,
-   `px.sunburst`, `px.treemap`, `px.funnel`, and `px.funnelarea` ([#1909](https://github.com/plotly/plotly.py/pull/1909)) `px.density_mapbox` and
+ - Extended the plotly.express functional API with 7 new functions: `px.pie`,
+   `px.sunburst`, `px.treemap`, `px.funnel`, and `px.funnel_area` ([#1909](https://github.com/plotly/plotly.py/pull/1909)) `px.density_mapbox` and
    `px.choropleth_mapbox` [#1937](https://github.com/plotly/plotly.py/pull/1937). Also, all mapbox functions in plotly.express have new arguments `center` and `mapbox_style` [#1937](https://github.com/plotly/plotly.py/pull/1937).
  - plotly.express polar plots (`scatter_polar`, `line_polar`, `bar_polar`) now
    have a `range_theta` keyword argument for representing only an angular

README.md

@@ -26,7 +26,7 @@
 
 ## Quickstart
 
-`pip install plotly==4.4.0`
+`pip install plotly==4.4.1`
 
 Inside [Jupyter notebook](https://jupyter.org/install) (installable with `pip install "notebook>=5.3" "ipywidgets>=7.2"`):
 ```python
@@ -72,12 +72,12 @@ Built on top of [plotly.js](https://github.com/plotly/plotly.js), `plotly.py` is
 
 plotly.py may be installed using pip...
 ```
-pip install plotly==4.4.0
+pip install plotly==4.4.1
 ```
 
 or conda.
 ```
-conda install -c plotly plotly=4.4.0
+conda install -c plotly plotly=4.4.1
 ```
 
 ### Jupyter Notebook Support

binder/requirements.txt

@@ -1,5 +1,5 @@
 jupytext
-plotly==4.3.0
+plotly==4.4.1
 jupyter
 notebook
 pandas==0.23.0

doc/python/getting-started.md

@@ -46,12 +46,12 @@ Thanks to deep integration with the [orca](https://github.com/plotly/orca) image
 plotly.py may be installed using pip...
 
 ```
-$ pip install plotly==4.4.0
+$ pip install plotly==4.4.1
 ```
 or conda.
 
 ```
-$ conda install -c plotly plotly=4.4.0
+$ conda install -c plotly plotly=4.4.1
 ```
 This package contains everything you need to write figures to standalone HTML files.
 

doc/requirements.txt

@@ -1,4 +1,4 @@
-plotly==4.4.0
+plotly==4.4.1
 jupytext==1.1.1
 jupyter
 notebook

packages/python/plotly/_plotly_utils/utils.py

@@ -197,8 +197,8 @@ def encode_as_decimal(obj):
     @staticmethod
     def encode_as_pil(obj):
         """Attempt to convert PIL.Image.Image to base64 data uri"""
-        pil = get_module("PIL")
-        if isinstance(obj, pil.Image.Image):
+        image = get_module("PIL.Image")
+        if image is not None and isinstance(obj, image.Image):
             return ImageUriValidator.pil_image_to_uri(obj)
         else:
             raise NotEncodable

packages/python/plotly/plotly/tests/test_core/test_utils/test_utils.py

@@ -15,6 +15,10 @@ def test_nan_to_null(self):
         expected_result = '[1, null, null, null, "platypus"]'
         self.assertEqual(result, expected_result)
 
+    def test_invalid_encode_exception(self):
+        with self.assertRaises(TypeError):
+            _json.dumps({"a": {1}}, cls=PlotlyJSONEncoder)
+
 
 class TestGetByPath(TestCase):
     def test_get_by_path(self):