naming/styling changes; change base response schema

2 files changed, 9 insertions, 5 deletions

diff --git a/src/db.py b/src/db.py
index 93e37e6..383a98a 100644
--- a/src/db.py
+++ b/src/db.py
@@ -25,7 +25,8 @@ import pickle
 import json
 import os
 
-anonymous = \
+anon_object = None
+anon_credentials = \
     ("anonymous",
      "5430eeed859cad61d925097ec4f53246"
      "1ccf1ab6b9802b09a313be1478a4d614")
@@ -228,7 +229,7 @@ def user_resolve(connection, name_or_id, externalize=False, return_false=True):
         return False
     raise BBJParameterError(
         "Requested user element ({})"
-        " does not exist".format(name_or_id))
+        " is not registered".format(name_or_id))
 
 
 def user_update(connection, user_object, parameters):
diff --git a/src/schema.py b/src/schema.py
index b376d53..0851ffa 100644
--- a/src/schema.py
+++ b/src/schema.py
@@ -1,12 +1,15 @@
 def base():
     return {
-        "error": False
+        "error": False,
+        "data": None,
+        "usermap": dict()
     }
 
 
-def response(dictionary):
+def response(data, usermap={}):
     result = base()
-    result.update(dictionary)
+    result["data"] = data
+    result["usermap"].update(usermap)
     return result