Refactor and add warnings disable

AndreiDrang · Feb 14, 2020 · 8494701 · 8494701
1 parent f823ccc
commit 8494701
Show file tree

Hide file tree

Showing 16 changed files with 46 additions and 42 deletions.
diff --git a/python3_anticaptcha/AntiCaptchaAppStats.py b/python3_anticaptcha/AntiCaptchaAppStats.py
@@ -1,5 +1,5 @@
-import requests
 import aiohttp
+import requests
 
 from python3_anticaptcha import get_app_stats_url
 

diff --git a/python3_anticaptcha/AntiCaptchaControl.py b/python3_anticaptcha/AntiCaptchaControl.py
@@ -1,12 +1,12 @@
-import requests
 import aiohttp
+import requests
 
 from python3_anticaptcha import (
     get_balance_url,
     get_app_stats_url,
-    incorrect_imagecaptcha_url,
-    incorrect_recaptcha_url,
     get_queue_status_url,
+    incorrect_recaptcha_url,
+    incorrect_imagecaptcha_url,
 )
 
 # available app stats mods

diff --git a/python3_anticaptcha/CallbackClient.py b/python3_anticaptcha/CallbackClient.py
@@ -2,16 +2,16 @@
 import time
 
 import requests
-import pika
 
+import pika
 from python3_anticaptcha import (
     HOST,
     PORT,
-    RTMQ_USERNAME,
-    RTMQ_PASSWORD,
     RTMQ_HOST,
     RTMQ_PORT,
     RTMQ_VHOST,
+    RTMQ_PASSWORD,
+    RTMQ_USERNAME,
 )
 
 

diff --git a/python3_anticaptcha/CustomCaptchaTask.py b/python3_anticaptcha/CustomCaptchaTask.py
@@ -1,10 +1,10 @@
 import time
 import asyncio
 
-import requests
 import aiohttp
+import requests
 
-from python3_anticaptcha import create_task_url, app_key, get_async_result, get_sync_result
+from python3_anticaptcha import app_key, create_task_url, get_sync_result, get_async_result
 
 
 class CustomCaptchaTask:

diff --git a/python3_anticaptcha/FunCaptchaTask.py b/python3_anticaptcha/FunCaptchaTask.py
@@ -4,7 +4,7 @@
 import aiohttp
 import requests
 
-from python3_anticaptcha import create_task_url, app_key, get_sync_result, get_async_result
+from python3_anticaptcha import app_key, create_task_url, get_sync_result, get_async_result
 
 
 class FunCaptchaTask:

diff --git a/python3_anticaptcha/FunCaptchaTaskProxyless.py b/python3_anticaptcha/FunCaptchaTaskProxyless.py
@@ -4,7 +4,7 @@
 import aiohttp
 import requests
 
-from python3_anticaptcha import create_task_url, app_key, get_sync_result, get_async_result
+from python3_anticaptcha import app_key, create_task_url, get_sync_result, get_async_result
 
 
 class FunCaptchaTaskProxyless:

diff --git a/python3_anticaptcha/GeeTestTask.py b/python3_anticaptcha/GeeTestTask.py
@@ -4,7 +4,7 @@
 import aiohttp
 import requests
 
-from python3_anticaptcha import create_task_url, app_key, get_sync_result, get_async_result
+from python3_anticaptcha import app_key, create_task_url, get_sync_result, get_async_result
 
 
 class GeeTestTask:

diff --git a/python3_anticaptcha/GeeTestTaskProxyless.py b/python3_anticaptcha/GeeTestTaskProxyless.py
@@ -1,10 +1,10 @@
 import time
 import asyncio
 
-import requests
 import aiohttp
+import requests
 
-from python3_anticaptcha import create_task_url, app_key, get_sync_result, get_async_result
+from python3_anticaptcha import app_key, create_task_url, get_sync_result, get_async_result
 
 
 class GeeTestTaskProxyless:

diff --git a/python3_anticaptcha/ImageToTextTask.py b/python3_anticaptcha/ImageToTextTask.py
@@ -1,20 +1,20 @@
+import os
 import time
+import base64
 import asyncio
 import hashlib
-import os
-import base64
 
-import requests
 import aiohttp
+import requests
 from requests.adapters import HTTPAdapter
 
 from python3_anticaptcha import (
-    create_task_url,
+    ReadError,
+    ParamError,
     app_key,
+    create_task_url,
     get_sync_result,
     get_async_result,
-    ParamError,
-    ReadError,
 )
 
 SAVE_FORMATS = ("const", "temp")

diff --git a/python3_anticaptcha/NoCaptchaTask.py b/python3_anticaptcha/NoCaptchaTask.py
@@ -1,10 +1,10 @@
 import time
 import asyncio
 
-import requests
 import aiohttp
+import requests
 
-from python3_anticaptcha import create_task_url, app_key, get_sync_result, get_async_result
+from python3_anticaptcha import app_key, create_task_url, get_sync_result, get_async_result
 
 
 class NoCaptchaTask:

diff --git a/python3_anticaptcha/NoCaptchaTaskProxyless.py b/python3_anticaptcha/NoCaptchaTaskProxyless.py
@@ -1,10 +1,10 @@
 import time
 import asyncio
 
-import requests
 import aiohttp
+import requests
 
-from python3_anticaptcha import create_task_url, app_key, get_sync_result, get_async_result
+from python3_anticaptcha import app_key, create_task_url, get_sync_result, get_async_result
 
 
 class NoCaptchaTaskProxyless:

diff --git a/python3_anticaptcha/ReCaptchaV3TaskProxyless.py b/python3_anticaptcha/ReCaptchaV3TaskProxyless.py
@@ -1,10 +1,10 @@
 import time
 import asyncio
 
-import requests
 import aiohttp
+import requests
 
-from python3_anticaptcha import create_task_url, app_key, get_sync_result, get_async_result
+from python3_anticaptcha import app_key, create_task_url, get_sync_result, get_async_result
 
 MIN_SCORES = (0.3, 0.7, 0.9)
 

diff --git a/python3_anticaptcha/SquareNetTextTask.py b/python3_anticaptcha/SquareNetTextTask.py
@@ -1,20 +1,20 @@
+import os
 import time
+import base64
 import asyncio
 import hashlib
-import os
-import base64
 
-import requests
 import aiohttp
+import requests
 from requests.adapters import HTTPAdapter
 
 from python3_anticaptcha import (
-    create_task_url,
+    ReadError,
+    ParamError,
     app_key,
+    create_task_url,
     get_sync_result,
     get_async_result,
-    ParamError,
-    ReadError,
 )
 
 

diff --git a/python3_anticaptcha/__init__.py b/python3_anticaptcha/__init__.py
@@ -1,19 +1,19 @@
 from .config import (
-    create_task_url,
-    app_key,
-    get_balance_url,
-    incorrect_imagecaptcha_url,
-    incorrect_recaptcha_url,
     HOST,
     PORT,
-    RTMQ_USERNAME,
-    RTMQ_PASSWORD,
     RTMQ_HOST,
     RTMQ_PORT,
     RTMQ_VHOST,
+    RTMQ_PASSWORD,
+    RTMQ_USERNAME,
+    app_key,
     get_result_url,
-    get_queue_status_url,
+    create_task_url,
+    get_balance_url,
     get_app_stats_url,
+    get_queue_status_url,
+    incorrect_recaptcha_url,
+    incorrect_imagecaptcha_url,
 )
+from .errors import ReadError, IdGetError, ParamError
 from .get_answer import get_sync_result, get_async_result
-from .errors import ParamError, ReadError, IdGetError
diff --git a/python3_anticaptcha/config.py b/python3_anticaptcha/config.py
@@ -1,3 +1,7 @@
+import urllib3
+
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+
 # Адрес для создания задачи
 create_task_url = "https://api.anti-captcha.com/createTask"
 # Адрес для получения ответа

diff --git a/python3_anticaptcha/get_answer.py b/python3_anticaptcha/get_answer.py
@@ -1,5 +1,5 @@
-import asyncio
 import time
+import asyncio
 
 import aiohttp
 import requests