2captcha-python 2.0.5__py3-none-any.whl → 2.0.6__py3-none-any.whl

{2captcha_python-2.0.5.dist-info → 2captcha_python-2.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: 2captcha-python
-Version: 2.0.5
+Version: 2.0.6
 Summary: Python module for easy integration with 2Captcha API
 Home-page: https://github.com/2captcha/2captcha-python/
 Author: 2Captcha
@@ -566,7 +566,7 @@ Use this method to solve Altcha Captcha. Returns a token.
 ```python
 result = solver.altcha(pageurl='https://mysite.com/page/with/altcha',
                        challenge_json='{"algorithm":"SHA-256","challenge":"a4c9d8e7f1b23a6c...",..."signature":"7b3e2a9d5c8f1046e2d91c3a..."}',
-                       # or: challenge_url='https://example.com/altcha-challenge',)
+                       # challenge_url='https://example.com/altcha-challenge',)
 ```
 
 ## Other methods

2captcha_python-2.0.6.dist-info/RECORD

@@ -0,0 +1,13 @@
+2captcha_python-2.0.6.dist-info/licenses/LICENSE,sha256=sbILKjQcxUC6dAvBbivnRX9YCshBI9XRvvk1LGkpMEo,1065
+twocaptcha/__init__.py,sha256=6YGd-Hwk935HVWLih6Nc9BLkLjCe4jMOFPt8qFJ0xWI,542
+twocaptcha/api.py,sha256=vlYOhc3rGIHOVGq4hZjJ54tUxBpBzI2FgWPctllb7D0,2826
+twocaptcha/async_api.py,sha256=L467rsgdVVrgWaLkvengoTE8GvCgQAfM2PmVO2kfad4,3534
+twocaptcha/async_solver.py,sha256=WzSu5EB8CBY-RLWlvoc9jgakuRsT3Msp_DJSg3Oecc8,51470
+twocaptcha/solver.py,sha256=DpYSm0lwNFViWRcH2rLhvd_OEQDKsGKLDNDbozp51as,58108
+twocaptcha/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+twocaptcha/exceptions/api.py,sha256=N810fZxcNE2AwCM9EyFrXpDpzAKsKi_tHCnRJn4CH7s,86
+twocaptcha/exceptions/solver.py,sha256=hvKUebPMvC51ve6MSmv_3q1J9vkhS90XO2ivoVToyoU,255
+2captcha_python-2.0.6.dist-info/METADATA,sha256=Lk0gAqP48Lsnc3EfjvvDuGHiw14n3_LvWTgvIIeHlAM,31493
+2captcha_python-2.0.6.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+2captcha_python-2.0.6.dist-info/top_level.txt,sha256=AvFZdM89oM6Vo97ZTxT9AxHWpwoO3_Qf5ORMV3NClFE,11
+2captcha_python-2.0.6.dist-info/RECORD,,

twocaptcha/__init__.py

@@ -17,4 +17,4 @@ support@2captcha.com
 """
 
 __author__ = '2captcha'
-__version__ = '2.0.5'
+__version__ = '2.0.6'

twocaptcha/async_solver.py

@@ -998,40 +998,29 @@ class AsyncTwoCaptcha():
                                   **kwargs)
         return result
 
-    async def altcha(self, pageurl, challenge_url=None, challenge_json=None, **kwargs):
+    async def altcha(self, pageurl, **kwargs):
         '''Wrapper for solving Altcha Captcha.
 
         Parameters
         __________
         pageurl : str
             Full URL of the page where you solve the captcha.
-        challenge_url : str
+        challenge_url : str, optional
             The value of the 'challenge_url' parameter for the 'altcha-widget' element containing the captcha on the page.
-            You can send either challenge_url or challenge_json parameter, but not two of it simultaneously.
-        challenge_json : str
-            The contents of the file from the 'challenge_url' parameter. You can send either challenge_url or challenge_json
-            parameter, but not two of it simultaneously.
+            At least one of the parameters 'challenge_url', 'challenge_json' must be passed.
+        challenge_json : str, optional
+            The contents of the file from the 'challenge_url' parameter.
+            At least one of the parameters 'challenge_url', 'challenge_json' must be passed.
         proxy : dict, optional
             {'type': 'HTTPS', 'uri': 'login:password@IP_address:PORT'}.
 
         '''
 
-        if (challenge_url is None) == (challenge_json is None):
-            raise ValidationException(
-                'You must provide exactly one of challenge_url or challenge_json'
-            )
-
-        params = {
-        'pageurl': pageurl,
-        'method': 'altcha',
-        **kwargs,}
-
-        if challenge_url is not None:
-            params['challenge_url'] = challenge_url
-        if challenge_json is not None:
-            params['challenge_json'] = challenge_json
+        result = self.solve(pageurl=pageurl,
+                            method='altcha',
+                            **kwargs)
 
-        return await self.solve(**params)
+        return await result
 
     async def solve(self, timeout=0, polling_interval=0, **kwargs):
         '''Sends captcha, receives result.

twocaptcha/solver.py

@@ -1132,39 +1132,30 @@ class TwoCaptcha():
                             **kwargs)
         return result
 
-    def altcha(self, pageurl, challenge_url=None, challenge_json=None, **kwargs):
+    def altcha(self, pageurl, **kwargs):
         '''Wrapper for solving Altcha Captcha.
 
         Parameters
         __________
         pageurl : str
             Full URL of the page where you solve the captcha.
-        challenge_url : str
+        challenge_url : str, optional
             The value of the 'challenge_url' parameter for the 'altcha-widget' element containing the captcha on the page.
-            You can send either challenge_url or challenge_json parameter, but not two of it simultaneously.
-        challenge_json : str
-            The contents of the file from the 'challenge_url' parameter. You can send either challenge_url or challenge_json
-            parameter, but not two of it simultaneously.
+            At least one of the parameters 'challenge_url', 'challenge_json' must be passed.
+        challenge_json : str, optional
+            The contents of the file from the 'challenge_url' parameter.
+            At least one of the parameters 'challenge_url', 'challenge_json' must be passed.
         proxy : dict, optional
             {'type': 'HTTPS', 'uri': 'login:password@IP_address:PORT'}.
 
         '''
 
-        if (challenge_url is None) == (challenge_json is None):
-            raise ValidationException(
-                'You must provide exactly one of challenge_url or challenge_json'
-            )
-        params = {
-            'pageurl': pageurl,
-            'method': "altcha",
-            **kwargs,
-        }
-        if challenge_url is not None:
-            params['challenge_url'] = challenge_url
-        if challenge_json is not None:
-            params['challenge_json'] = challenge_json
+        result = self.solve(
+            pageurl=pageurl,
+            method="altcha",
+            **kwargs)
         
-        return self.solve(**params)
+        return result
 
 
     def solve(self, timeout=0, polling_interval=0, **kwargs):

2captcha_python-2.0.5.dist-info/RECORD

@@ -1,13 +0,0 @@
-2captcha_python-2.0.5.dist-info/licenses/LICENSE,sha256=sbILKjQcxUC6dAvBbivnRX9YCshBI9XRvvk1LGkpMEo,1065
-twocaptcha/__init__.py,sha256=xF6LYkx3mPn10XiEwC_MYCEovkihJ8JD8WRZDiVm4Hs,542
-twocaptcha/api.py,sha256=vlYOhc3rGIHOVGq4hZjJ54tUxBpBzI2FgWPctllb7D0,2826
-twocaptcha/async_api.py,sha256=L467rsgdVVrgWaLkvengoTE8GvCgQAfM2PmVO2kfad4,3534
-twocaptcha/async_solver.py,sha256=A5dvMWM8s5QwevwkW6SaM596V8fXdRcPnO08i6YXylc,51887
-twocaptcha/solver.py,sha256=fYy4HfsgKC3CWwvFhJYz-nF69tThJnd9Zl7XO_jw1gU,58563
-twocaptcha/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-twocaptcha/exceptions/api.py,sha256=N810fZxcNE2AwCM9EyFrXpDpzAKsKi_tHCnRJn4CH7s,86
-twocaptcha/exceptions/solver.py,sha256=hvKUebPMvC51ve6MSmv_3q1J9vkhS90XO2ivoVToyoU,255
-2captcha_python-2.0.5.dist-info/METADATA,sha256=YYSwt8uT0zFlkkpqlrmJxfzUEZ60ztL53WeDYQML5KM,31497
-2captcha_python-2.0.5.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-2captcha_python-2.0.5.dist-info/top_level.txt,sha256=AvFZdM89oM6Vo97ZTxT9AxHWpwoO3_Qf5ORMV3NClFE,11
-2captcha_python-2.0.5.dist-info/RECORD,,