More fleshing it out

thunix_api.py

@@ -2,39 +2,50 @@
 import flask
 
 from flask import Flask, request, jsonify
+
+import psutil, datetime
+
+
 app = Flask(__name__)
 
+
 # No endpoint selected
 @app.route("/")
 def home():
     return "The Thunix API.  Please see https://wiki.thunix.net/wiki/api for more information."
     app.run()
 
+
 # ip_info
 @app.route("/ip_info")
 def ip_info():
     return "IP Info"
     app.run()
 
+
 # uptime
 @app.route("/uptime")
 def uptime():
-    return "Uptime"
+
+    return str(datetime.timedelta(seconds=psutil.boot_time()))
     app.run()
 
+
 # teapot
 @app.route("/teapot")
 def teapot():
-    teapot = [
+    teapots = [
-{
+        {
-   "tea" : "available",
+            "tea": "available",
-   "height" : "short",
+            "height": "short",
-   "width" : "stout"
+            "width": "stout"
-}
+        }
-]
+    ]
-    return jsonify(teapot)
+    return jsonify(teapots)
     app.run()
 
+
 # main loop
-if __name__ == "__main__":        # on running python app.py
+if __name__ == "__main__":  # on running python app.py
-    app.run()                     # run the flask app
+    app.run()  # run the flask app
+