From d6816a02ec9a9bbca37bf01be98b2ffd34a3727b Mon Sep 17 00:00:00 2001
From: Brian Martin <bmartin5692@gmail.com>
Date: Sun, 12 May 2019 15:31:52 -0400
Subject: [PATCH] Remove vars

Start removal
---
 bumper/__init__.py   | 5 -----
 bumper/confserver.py | 1 -
 bumper/mqttserver.py | 8 ++++----
 bumper/xmppserver.py | 1 -
 start_bumper.py      | 8 --------
 5 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/bumper/__init__.py b/bumper/__init__.py
index cd21a05..9abbbce 100644
--- a/bumper/__init__.py
+++ b/bumper/__init__.py
@@ -5,7 +5,6 @@ from .mqttserver import MQTTServer
 from .mqttserver import MQTTHelperBot
 from .xmppserver import XMPPServer
 import asyncio
-import contextvars
 import time
 from datetime import datetime, timedelta
 import platform
@@ -17,10 +16,6 @@ from tinydb import TinyDB, Query
 import json
 from tinydb.storages import MemoryStorage
 
-bumper_users_var = contextvars.ContextVar("bumper_users", default=[])
-bumper_clients_var = contextvars.ContextVar("bumper_clients", default=[])
-bumper_bots_var = contextvars.ContextVar("bumper_bots", default=[])
-
 ca_cert = "./certs/CA/cacert.pem"
 server_cert = "./certs/cert.pem"
 server_key = "./certs/key.pem"
diff --git a/bumper/confserver.py b/bumper/confserver.py
index 375e931..bd5f42f 100644
--- a/bumper/confserver.py
+++ b/bumper/confserver.py
@@ -8,7 +8,6 @@ import bumper
 import time
 from datetime import datetime, timedelta
 import asyncio
-import contextvars
 from aiohttp import web
 import uuid
 
diff --git a/bumper/mqttserver.py b/bumper/mqttserver.py
index 40cf783..859fd69 100644
--- a/bumper/mqttserver.py
+++ b/bumper/mqttserver.py
@@ -8,7 +8,7 @@ from hbmqtt.broker import Broker
 from hbmqtt.client import MQTTClient
 from hbmqtt.mqtt.constants import QOS_0, QOS_1, QOS_2
 import pkg_resources
-import contextvars
+#import contextvars
 import time
 from threading import Thread
 import ssl
@@ -40,7 +40,7 @@ class MQTTHelperBot:
     ):
         self.address = address
         self.client_id = "helper1@bumper/helper1"
-        self.command_responses = contextvars.ContextVar("command_responses", default=[])
+        self.command_responses = [] # = contextvars.ContextVar("command_responses", default=[])
         self.helperthread = None
 
     def run(self, run_async=False):
@@ -99,7 +99,7 @@ class MQTTHelperBot:
                 message = await self.Client.deliver_message()
 
                 # helperbotlog.debug("HelperBot MQTT Received Message on Topic: {} - Message: {}".format(message.topic, str(message.payload.decode("utf-8"))))
-                cresp = self.command_responses.get()
+                cresp = self.command_responses #.get()
 
                 if str(message.topic).split("/")[6] == "helper1":
                     cresp.append(
@@ -119,7 +119,7 @@ class MQTTHelperBot:
                         # helperbotlog.debug("Pruning Message Time: {}, MsgTime: {}, MsgTime+60: {}".format(time.time(), msg['time'], expire_time))
                         cresp.remove(msg)
 
-                self.command_responses.set(cresp)
+                self.command_responses = cresp #.set(cresp)
                 # helperbotlog.debug("MQTT Command Response List Count: %s" %len(cresp))
 
         except Exception as e:
diff --git a/bumper/xmppserver.py b/bumper/xmppserver.py
index 6d86d09..02471c4 100644
--- a/bumper/xmppserver.py
+++ b/bumper/xmppserver.py
@@ -4,7 +4,6 @@ from threading import Thread
 import sys, socket, threading, re, time, logging, uuid, xml.etree.ElementTree as ET
 import base64
 import ssl
-import contextvars
 import bumper
 import asyncio
 
diff --git a/start_bumper.py b/start_bumper.py
index a6796f8..0f777d8 100644
--- a/start_bumper.py
+++ b/start_bumper.py
@@ -51,14 +51,6 @@ def main():
         conf_address_8007, usessl=False, helperbot=mqtt_helperbot
     )
 
-    # add user
-    # users = bumper.bumper_users_var.get()
-    # user1 = bumper.BumperUser('user1')
-    # user1.add_device('devid')
-    # user1.add_bot('bot_did')
-    # users.append(user1)
-    # bumper.bumper_users_var.set(users)
-
     try:
         loop = asyncio.get_event_loop()
     except: