arnekeller/googleplay-api
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/googleplay-api.git synced 2024-11-22 12:54:58 +00:00
Code Issues Projects Releases Wiki Activity

Removed debug feature

Browse Source
This commit is contained in:
Domenico Iezzi 2017-11-15 15:48:55 +01:00
parent f7163f5615
commit 0fc9cb9fef
No known key found for this signature in database
GPG Key ID: 7AC94D5DDA2FB7EE
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gpapi/googleplay.py
View File

@ -60,7 +60,6 @@ class GooglePlayAPI(object):
if cell_operator is not None: if cell_operator is not None:
self.deviceBuilder.device['celloperator'] = cell_operator self.deviceBuilder.device['celloperator'] = cell_operator
# save last response text for error logging # save last response text for error logging
self.lastResponseText = None
def encrypt_password(self, login, passwd): def encrypt_password(self, login, passwd):
"""Encrypt the password using the google publickey, using """Encrypt the password using the google publickey, using
@ -161,8 +160,6 @@ class GooglePlayAPI(object):
# AC2DM token # AC2DM token
params = self.deviceBuilder.getLoginParams(email, encryptedPass) params = self.deviceBuilder.getLoginParams(email, encryptedPass)
response = requests.post(self.AUTHURL, data=params, verify=ssl_verify) response = requests.post(self.AUTHURL, data=params, verify=ssl_verify)
if self.debug:
self.lastResponseText = response.text
data = response.text.split() data = response.text.split()
params = {} params = {}
for d in data: for d in data:
@ -179,8 +176,6 @@ class GooglePlayAPI(object):
"to unlock, or setup an app-specific password") "to unlock, or setup an app-specific password")
raise LoginError("server says: " + params["error"]) raise LoginError("server says: " + params["error"])
else: else:
if self.debug:
print('Last response text: %s' % self.lastResponseText)
raise LoginError("Auth token not found.") raise LoginError("Auth token not found.")
self.gsfId = self.checkin(email, ac2dmToken) self.gsfId = self.checkin(email, ac2dmToken)
@ -203,8 +198,6 @@ class GooglePlayAPI(object):
requestParams = self.deviceBuilder.getAuthParams(email, passwd) requestParams = self.deviceBuilder.getAuthParams(email, passwd)
response = requests.post(self.AUTHURL, data=requestParams, verify=ssl_verify) response = requests.post(self.AUTHURL, data=requestParams, verify=ssl_verify)
data = response.text.split() data = response.text.split()
if self.debug:
self.lastResponseText = response.text
params = {} params = {}
for d in data: for d in data:
if "=" not in d: if "=" not in d:
@ -220,8 +213,6 @@ class GooglePlayAPI(object):
elif "error" in params: elif "error" in params:
raise LoginError("server says: " + params["error"]) raise LoginError("server says: " + params["error"])
else: else:
if self.debug:
print('Last response text: %s' % self.lastResponseText)
raise LoginError("Auth token not found.") raise LoginError("Auth token not found.")
def getSecondRoundToken(self, previousParams, firstToken): def getSecondRoundToken(self, previousParams, firstToken):
@ -238,8 +229,6 @@ class GooglePlayAPI(object):
data=previousParams, data=previousParams,
verify=ssl_verify) verify=ssl_verify)
data = response.text.split() data = response.text.split()
if self.debug:
self.lastResponseText = response.text
params = {} params = {}
for d in data: for d in data:
if "=" not in d: if "=" not in d:
@ -251,8 +240,6 @@ class GooglePlayAPI(object):
elif "error" in params: elif "error" in params:
raise LoginError("server says: " + params["error"]) raise LoginError("server says: " + params["error"])
else: else:
if self.debug:
print('Last response text: %s' % self.lastResponseText)
raise LoginError("Auth token not found.") raise LoginError("Auth token not found.")
def executeRequestApi2(self, path, datapost=None, def executeRequestApi2(self, path, datapost=None,
@ -274,12 +261,8 @@ class GooglePlayAPI(object):
verify=ssl_verify, verify=ssl_verify,
timeout=60) timeout=60)
if self.debug:
self.lastResponseText = response.text
message = googleplay_pb2.ResponseWrapper.FromString(response.content) message = googleplay_pb2.ResponseWrapper.FromString(response.content)
if message.commands.displayErrorMessage != "": if message.commands.displayErrorMessage != "":
if self.debug:
print('Last response text: %s' % self.lastResponseText)
raise RequestError(message.commands.displayErrorMessage) raise RequestError(message.commands.displayErrorMessage)
return message return message
@ -316,8 +299,6 @@ class GooglePlayAPI(object):
if len(response.payload.listResponse.cluster) == 0: if len(response.payload.listResponse.cluster) == 0:
# strange behaviour, probably due to # strange behaviour, probably due to
# expired token # expired token
if self.debug:
print('Last response text: %s' % self.lastResponseText)
raise LoginError('Unexpected behaviour, probably expired ' raise LoginError('Unexpected behaviour, probably expired '
'token') 'token')
cluster = response.payload.listResponse.cluster[0] cluster = response.payload.listResponse.cluster[0]
@ -530,8 +511,6 @@ class GooglePlayAPI(object):
timeout=60) timeout=60)
resObj = googleplay_pb2.ResponseWrapper.FromString(response.content) resObj = googleplay_pb2.ResponseWrapper.FromString(response.content)
if resObj.commands.displayErrorMessage != "": if resObj.commands.displayErrorMessage != "":
if self.debug:
print('Last response text: %s' % self.lastResponseText)
raise RequestError(resObj.commands.displayErrorMessage) raise RequestError(resObj.commands.displayErrorMessage)
elif resObj.payload.deliveryResponse.appDeliveryData.downloadUrl == "": elif resObj.payload.deliveryResponse.appDeliveryData.downloadUrl == "":
raise RequestError('App not purchased') raise RequestError('App not purchased')
@ -598,8 +577,6 @@ class GooglePlayAPI(object):
resObj = googleplay_pb2.ResponseWrapper.FromString(response.content) resObj = googleplay_pb2.ResponseWrapper.FromString(response.content)
if resObj.commands.displayErrorMessage != "": if resObj.commands.displayErrorMessage != "":
if self.debug:
print('Last response text: %s' % self.lastResponseText)
raise RequestError(resObj.commands.displayErrorMessage) raise RequestError(resObj.commands.displayErrorMessage)
else: else:
dlToken = resObj.payload.buyResponse.downloadToken dlToken = resObj.payload.buyResponse.downloadToken