Skip to content

Optimised imports, minor grammar fixes - solver.py #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Optimised imports, minor grammar fixes - solver.py #90

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions twocaptcha/solver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
#!/usr/bin/env python3

import os, sys
import time
import requests
from requests import get
from time import sleep, time
from sys import argv
from os import path
from base64 import b64encode


try:
from .api import ApiClient

except ImportError:
from api import ApiClient

Expand Down Expand Up @@ -54,7 +53,7 @@ def __init__(self,
self.exceptions = SolverExceptions

def normal(self, file, **kwargs):
'''Wrapper for solving normal captcha (image).
'''Wrapper for solving a normal captcha (image).

Parameters
__________
Expand Down Expand Up @@ -119,7 +118,7 @@ def audio(self, file, lang, **kwargs):
elif not '.' in file and len(file) > 50:
body = file
elif file.endswith(".mp3") and file.startswith("http"):
response = requests.get(file)
response = get(file)
if response.status_code != 200:
raise ValidationException(f'File could not be downloaded from url: {file}')
body = b64encode(response.content).decode('utf-8')
Expand Down Expand Up @@ -837,16 +836,16 @@ def solve(self, timeout=0, polling_interval=0, **kwargs):

def wait_result(self, id_, timeout, polling_interval):

max_wait = time.time() + timeout
max_wait = time() + timeout

while time.time() < max_wait:
while time() < max_wait:

try:
return self.get_result(id_)

except NetworkException:

time.sleep(polling_interval)
sleep(polling_interval)

raise TimeoutException(f'timeout {timeout} exceeded')

Expand All @@ -859,12 +858,12 @@ def get_method(self, file):
return {'method': 'base64', 'body': file}

if file.startswith('http'):
img_resp = requests.get(file)
img_resp = get(file)
if img_resp.status_code != 200:
raise ValidationException(f'File could not be downloaded from url: {file}')
return {'method': 'base64', 'body': b64encode(img_resp.content).decode('utf-8')}

if not os.path.exists(file):
if not path.exists(file):
raise ValidationException(f'File not found: {file}')

return {'method': 'post', 'file': file}
Expand Down Expand Up @@ -1004,7 +1003,7 @@ def extract_files(self, files):
raise ValidationException(
f'Too many files (max: {self.max_files})')

not_exists = [f for f in files if not (os.path.exists(f))]
not_exists = [f for f in files if not (path.exists(f))]

if not_exists:
raise ValidationException(f'File not found: {not_exists}')
Expand All @@ -1023,7 +1022,7 @@ def check_hint_img(self, params):
if not '.' in hint and len(hint) > 50:
return params, files

if not os.path.exists(hint):
if not path.exists(hint):
raise ValidationException(f'File not found: {hint}')

if not files:
Expand All @@ -1035,6 +1034,5 @@ def check_hint_img(self, params):


if __name__ == '__main__':

key = sys.argv[1]
key = argv[1]
sol = TwoCaptcha(key)