Merge pull request #10317 from gnestor/json-warn

Suppress "not JSON strings" warning if `filename` argument is provided

IPython/core/display.py

@@ -655,6 +655,7 b' class JSON(DisplayObject):'
     @data.setter
     def data(self, data):
         if isinstance(data, str):
+            if getattr(self, 'filename', None) is None:
             warnings.warn("JSON expects JSONable dict or list, not JSON strings")
             data = json.loads(data)
         self._data = data
@@ -757,6 +758,8 b' class GeoJSON(DisplayObject):'
     @data.setter
     def data(self, data):
         if isinstance(data, str):
+            if getattr(self, 'filename', None) is None:
+                warnings.warn("GeoJSON expects JSONable dict or list, not JSON strings")
             data = json.loads(data)
         self._data = data