From 0e6ccd687bf1a205e5eb5e411d42a70bebf7131d Mon Sep 17 00:00:00 2001
From: Jim Paris <jim@jtan.com>
Date: Tue, 30 Jul 2019 09:02:16 -0400
Subject: [PATCH] Fix missing Exception.message in Python 3

---
 nilmdb/client/httpclient.py | 2 +-
 nilmdb/server/errors.py     | 5 ++---
 nilmdb/server/server.py     | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/nilmdb/client/httpclient.py b/nilmdb/client/httpclient.py
index 24aa495..5b67203 100644
--- a/nilmdb/client/httpclient.py
+++ b/nilmdb/client/httpclient.py
@@ -87,7 +87,7 @@ class HTTPClient(object):
             session.close()
         except requests.RequestException as e:
             raise ServerError(status = "502 Error", url = url,
-                              message = str(e.message))
+                              message = str(e))
         if response.status_code != 200:
             self._handle_error(url, response.status_code, response.content)
         self._last_response = response
diff --git a/nilmdb/server/errors.py b/nilmdb/server/errors.py
index 7ecf12f..c5be4a6 100644
--- a/nilmdb/server/errors.py
+++ b/nilmdb/server/errors.py
@@ -2,9 +2,8 @@
 
 class NilmDBError(Exception):
     """Base exception for NilmDB errors"""
-    def __init__(self, message = "Unspecified error"):
-        super().__init__(message)
-        self.message = message
+    def __init__(self, msg = "Unspecified error"):
+        super().__init__(msg)
 
 class StreamError(NilmDBError):
     pass
diff --git a/nilmdb/server/server.py b/nilmdb/server/server.py
index 8d02046..3eac639 100644
--- a/nilmdb/server/server.py
+++ b/nilmdb/server/server.py
@@ -166,7 +166,7 @@ class Stream(NilmApp):
         try:
             data = self.db.stream_get_metadata(path)
         except nilmdb.server.nilmdb.StreamError as e:
-            raise cherrypy.HTTPError("404 Not Found", e.message)
+            raise cherrypy.HTTPError("404 Not Found", str(e))
         if key is None:  # If no keys specified, return them all
             key = list(data.keys())
         elif not isinstance(key, list):
@@ -185,7 +185,7 @@ class Stream(NilmApp):
             try:
                 data = dict(json.loads(data))
             except TypeError as e:
-                raise NilmDBError("can't parse 'data' parameter: " + e.message)
+                raise NilmDBError("can't parse 'data' parameter: " + str(e))
         for key in data:
             if not (isinstance(data[key], str) or
                     isinstance(data[key], float) or