EZPPFarm/pep.py
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

.BANCHO. .FIX. Code cleaning

Browse Source
This commit is contained in:
Nyo
2016-09-02 17:45:10 +02:00
parent 3703618112
commit cf60c167b6
42 changed files with 212 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
handlers/apiFokabotMessageHandler.py
View File

@@ -11,7 +11,7 @@ class handler(requestHelper.asyncRequestHandler):
data = {"message": "unknown error"}
try:
# Check arguments
if requestHelper.checkArguments(self.request.arguments, ["k", "to", "msg"]) == False:
if not requestHelper.checkArguments(self.request.arguments, ["k", "to", "msg"]):
raise exceptions.invalidArgumentsException()
# Check ci key

8
handlers/apiIsOnlineHandler.py
View File

@@ -23,13 +23,13 @@ class handler(requestHelper.asyncRequestHandler):
except:
raise exceptions.invalidArgumentsException()
if username == None and userID == None:
if username is None and userID is None:
data["result"] = False
else:
if username != None:
data["result"] = True if glob.tokens.getTokenFromUsername(username) != None else False
if username is not None:
data["result"] = True if glob.tokens.getTokenFromUsername(username) is not None else False
else:
data["result"] = True if glob.tokens.getTokenFromUserID(userID) != None else False
data["result"] = True if glob.tokens.getTokenFromUserID(userID) is not None else False
# Status code and message
statusCode = 200

2
handlers/apiVerifiedStatusHandler.py
View File

@@ -10,7 +10,7 @@ class handler(requestHelper.asyncRequestHandler):
data = {"message": "unknown error"}
try:
# Check arguments
if requestHelper.checkArguments(self.request.arguments, ["u"]) == False:
if not requestHelper.checkArguments(self.request.arguments, ["u"]):
raise exceptions.invalidArgumentsException()
# Get userID and its verified cache thing

2
handlers/ciTriggerHandler.py
View File

@@ -11,7 +11,7 @@ class handler(requestHelper.asyncRequestHandler):
data = {"message": "unknown error"}
try:
# Check arguments
if requestHelper.checkArguments(self.request.arguments, ["k"]) == False:
if not requestHelper.checkArguments(self.request.arguments, ["k"]):
raise exceptions.invalidArgumentsException()
# Check ci key

11
handlers/mainHandler.py
View File

@@ -60,7 +60,7 @@ class handler(SentryMixin, requestHelper.asyncRequestHandler):
def asyncPost(self):
try:
# Track time if needed
if glob.outputRequestTime == True:
if glob.outputRequestTime:
# Start time
st = datetime.datetime.now()
@@ -70,9 +70,8 @@ class handler(SentryMixin, requestHelper.asyncRequestHandler):
# Server's token string and request data
responseTokenString = "ayy"
responseData = bytes()
if requestTokenString == None:
if requestTokenString is None:
# No token, first request. Handle login.
responseTokenString, responseData = loginEvent.handle(self)
else:
@@ -198,10 +197,10 @@ class handler(SentryMixin, requestHelper.asyncRequestHandler):
log.info("{} has been disconnected (invalid token)".format(requestTokenString))
finally:
# Unlock token
if userToken != None:
if userToken is not None:
userToken.lock.release()
if glob.outputRequestTime == True:
if glob.outputRequestTime:
# End time
et = datetime.datetime.now()
@@ -211,7 +210,7 @@ class handler(SentryMixin, requestHelper.asyncRequestHandler):
# Send server's response to client
# We don't use token object because we might not have a token (failed login)
if glob.gzip == True:
if glob.gzip:
# First, write the gzipped response
self.write(gzip.compress(responseData, int(glob.conf.config["server"]["gziplevel"])))