Raise error on HTTP Error and fix json w/ no path

Author: makermelissa

adafruit_pyportal.py

@@ -938,9 +938,6 @@ def fetch(self, refresh_url=None, timeout=10):
                     elif "application/javascript" in headers["content-type"]:
                         content_type = CONTENT_JSON
             else:
-                print(
-                    "HTTP Error {}: {}".format(r.status_code, r.reason.decode("utf-8"))
-                )
                 if self._debug:
                     if "content-length" in headers:
                         print(
@@ -949,7 +946,9 @@ def fetch(self, refresh_url=None, timeout=10):
                     if "date" in headers:
                         print("Date: {}".format(headers["date"]))
                 self.neo_status((100, 0, 0))  # red = http error
-                return None
+                raise OSError(
+                    "HTTP {}: {}".format(r.status_code, r.reason.decode("utf-8"))
+                )
 
         if self._debug and content_type == CONTENT_TEXT:
             print(r.text)
@@ -993,11 +992,17 @@ def fetch(self, refresh_url=None, timeout=10):
                 except KeyError:
                     print(json_out)
                     raise
-        elif self._regexp_path:
+        elif content_type == CONTENT_TEXT and self._regexp_path:
             for regexp in self._regexp_path:
                 values.append(re.search(regexp, r.text).group(1))
         else:
-            values = r.text
+            if content_type == CONTENT_JSON:
+                # No path given, so return JSON as string for compatibility
+                import json  # pylint: disable=import-outside-toplevel
+
+                values = json.dumps(r.json())
+            else:
+                values = r.text
 
         if self._image_json_path:
             try: