From 12b546fc91cd6b100646d2628903d708f9e69f7c Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Mon, 7 Dec 2020 09:23:15 -0800 Subject: [PATCH] Speed up by not autoconnecting on setting URL --- adafruit_portalbase/__init__.py | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/adafruit_portalbase/__init__.py b/adafruit_portalbase/__init__.py index d63483a..79ea92a 100755 --- a/adafruit_portalbase/__init__.py +++ b/adafruit_portalbase/__init__.py @@ -66,7 +66,6 @@ def __init__( json_transform=None, debug=False, ): - self.network = network self.graphics = graphics self.splash = self.graphics.splash @@ -82,9 +81,7 @@ def __init__( self._alarm = alarm except ImportError: self._alarm = None - self._debug = debug - self._url = None self.url = url self._headers = headers self._json_path = None @@ -354,11 +351,11 @@ def fetch(self, refresh_url=None, timeout=10): """ if refresh_url: - self._url = refresh_url + self.url = refresh_url values = [] values = self.network.fetch_data( - self._url, + self.url, headers=self._headers, json_path=self._json_path, regexp_path=self._regexp_path, @@ -426,21 +423,6 @@ def get_io_group(self, group_key): """ return self.network.get_io_group(group_key) - @property - def url(self): - """ - Get or set the URL of your data source. - """ - return self._url - - @url.setter - def url(self, value): - self._url = value - if value and not self.network.uselocal: - self.network.connect() - # if self._debug: - # print("My IP address is", self.network.ip_address) - @property def json_path(self): """