##// END OF EJS Templates
Suppress "not JSON strings" warning if `filename` argument is provided
Grant Nestor -
Show More
@@ -655,7 +655,8 b' class JSON(DisplayObject):'
655 @data.setter
655 @data.setter
656 def data(self, data):
656 def data(self, data):
657 if isinstance(data, str):
657 if isinstance(data, str):
658 warnings.warn("JSON expects JSONable dict or list, not JSON strings")
658 if self.filename is None:
659 warnings.warn("JSON expects JSONable dict or list, not JSON strings")
659 data = json.loads(data)
660 data = json.loads(data)
660 self._data = data
661 self._data = data
661
662
@@ -689,6 +690,8 b' class GeoJSON(JSON):'
689 @data.setter
690 @data.setter
690 def data(self, data):
691 def data(self, data):
691 if isinstance(data, str):
692 if isinstance(data, str):
693 if self.filename is None:
694 warnings.warn("GeoJSON expects JSONable dict or list, not JSON strings")
692 data = json.loads(data)
695 data = json.loads(data)
693 self._data = data
696 self._data = data
694
697
General Comments 0
You need to be logged in to leave comments. Login now