.BANCHO. Switched from tornado to bottle + gevent, code cleaning

events/changeMatchSettingsEvent.py

@@ -1,8 +1,6 @@
 from objects import glob
 from constants import clientPackets
 from constants import matchModModes
-from helpers import consoleHelper
-from constants import bcolors
 import random
 from constants import matchTeamTypes
 from constants import matchTeams

events/changeSlotEvent.py

@@ -1,12 +1,9 @@
 from constants import clientPackets
 from objects import glob
-from helpers import consoleHelper
-from constants import bcolors
 
 def handle(userToken, packetData):
 	# Get usertoken data
 	userID = userToken.userID
-	username = userToken.username
 
 	# Read packet data
 	packetData = clientPackets.changeSlot(packetData)

events/channelPartEvent.py

@@ -1,6 +1,3 @@
-"""
-Event called when someone parts a channel
-"""
 from constants import clientPackets
 from helpers import chatHelper as chat
 

events/loginEvent.py

@@ -2,27 +2,22 @@ from helpers import userHelper
 from constants import serverPackets
 from constants import exceptions
 from objects import glob
-from helpers import consoleHelper
-from constants import bcolors
 from helpers import locationHelper
 from helpers import countryHelper
-import time
-from helpers import generalFunctions
 import sys
 import traceback
-from helpers import requestHelper
-from helpers import discordBotHelper
 from helpers import logHelper as log
 from helpers import chatHelper as chat
 from constants import privileges
+from helpers import requestHelper
 
-def handle(tornadoRequest):
+def handle(bottleRequest):
 	# Data to return
 	responseTokenString = "ayy"
 	responseData = bytes()
 
 	# Get IP from tornado request
-	requestIP = tornadoRequest.getRequestIP()
+	requestIP = requestHelper.getRequestIP(bottleRequest)
 
 	# Avoid exceptions
 	clientData = ["unknown", "unknown", "unknown", "unknown", "unknown"]
@@ -30,7 +25,8 @@ def handle(tornadoRequest):
 
 	# Split POST body so we can get username/password/hardware data
 	# 2:-3 thing is because requestData has some escape stuff that we don't need
-	loginData = str(tornadoRequest.request.body)[2:-3].split("\\n")
+	postBody = bottleRequest.body.read()
+	loginData = str(postBody)[2:-3].split("\\n")
 	try:
 		# If true, print error to console
 		err = False

events/logoutEvent.py

@@ -1,6 +1,4 @@
 from objects import glob
-from helpers import consoleHelper
-from constants import bcolors
 from constants import serverPackets
 import time
 from helpers import logHelper as log

events/matchFramesEvent.py

@@ -1,7 +1,6 @@
 from objects import glob
 from constants import slotStatuses
 from constants import serverPackets
-from helpers import logHelper as log
 
 def handle(userToken, packetData):
 	# Get usertoken data

events/partLobbyEvent.py

@@ -1,5 +1,4 @@
 from objects import glob
-from events import channelPartEvent
 from helpers import logHelper as log
 from helpers import chatHelper as chat
 

events/partMatchEvent.py

@@ -1,5 +1,4 @@
 from objects import glob
-from helpers import chatHelper as chat
 
 def handle(userToken, _):
 	# get data from usertoken

events/requestStatusUpdateEvent.py

@@ -1,6 +1,4 @@
-from constants import clientPackets
 from constants import serverPackets
-from helpers import userHelper
 from helpers import logHelper as log
 
 def handle(userToken, packetData):