v1.1.0

Author: Mark Miller

README.md

@@ -43,6 +43,7 @@ Also there are few options that can be configured:
 
 ```python 
 config = {
+            'server':           '2captcha.com',
     		'apiKey':           'YOUR_API_KEY',
     		'softId':            123,
     		'callback':         'https://your.site/result-receiver',
@@ -57,6 +58,7 @@ solver = TwoCaptcha(**config)
 
 |Option|Default value|Description|
 |---|---|---|
+|server|`2captcha.com`|API server. You can set it to `rucaptcha.com` if your account is registered there|
 |softId|-|your software ID obtained after publishing in [2captcha sofware catalog]|
 |callback|-|URL of your web-sever that receives the captcha recognition result. The URl should be first registered in [pingback settings] of your account|
 |defaultTimeout|120|Polling timeout in seconds for all captcha types except ReCaptcha. Defines how long the module tries to get the answer from `res.php` API endpoint|
@@ -182,7 +184,7 @@ result = solver.coordinates('path/to/captcha.jpg', param1=..., ...)
 ### Rotate
 This method can be used to solve a captcha that asks to rotate an object. Mostly used to bypass FunCaptcha. Returns the rotation angle.
 ```python
-result = solver.rotate(['path/to/captcha1.jpg', 'path/to/captcha2.jpg', ...], param1=..., ...)
+result = solver.rotate('path/to/captcha.jpg', param1=..., ...)
 ```
 
 ## Other methods

tests/test_recaptcha.py

@@ -25,7 +25,8 @@ def test_v2(self):
                 'method'    : 'userrecaptcha',
                 'googlekey' : '6Le-wvkSVVABCPBMRTvw0Q4Muexq1bi0DJwx_mJ-',
                 'pageurl'   : 'https://mysite.com/page/with/recaptcha',
-                'invisible' :  1,
+                'invisible': 1,
+                'enterprise': 0,                
                 'action'    : 'verify',
                 'version'   : 'v2',
                 }
@@ -47,7 +48,8 @@ def test_v3(self):
                 'method'    : 'userrecaptcha',
                 'googlekey' : '6Le-wvkSVVABCPBMRTvw0Q4Muexq1bi0DJwx_mJ-',
                 'pageurl'   : 'https://mysite.com/page/with/recaptcha',
-                'invisible' :  1,
+                'invisible' : 1,
+                'enterprise': 0,
                 'action'    : 'verify',
                 'version'   : 'v3',
                 }

twocaptcha/__init__.py

@@ -2,4 +2,4 @@
 from .solver import (TwoCaptcha, SolverExceptions, ValidationException,
                      NetworkException, ApiException, TimeoutException)
 
-__version__ = '1.0.3'
+__version__ = '1.1.0'

twocaptcha/solver.py

@@ -95,7 +95,7 @@ def text(self, text, **kwargs):
         result = self.solve(text=text, method='post', **kwargs)
         return result
 
-    def recaptcha(self, sitekey, url, version='v2', **kwargs):
+    def recaptcha(self, sitekey, url, version='v2', enterprise=0, **kwargs):
         '''
         Wrapper for solving recaptcha (v2, v3)
 
@@ -107,6 +107,7 @@ def recaptcha(self, sitekey, url, version='v2', **kwargs):
             
             invisible
             version
+            enterprise
             action
             score
             softId
@@ -119,6 +120,7 @@ def recaptcha(self, sitekey, url, version='v2', **kwargs):
             'url': url,
             'method': 'userrecaptcha',
             'version': version,
+            'enterprise': enterprise,
             **kwargs,
         }
 
@@ -182,7 +184,9 @@ def hcaptcha(self, sitekey, url, **kwargs):
             url
 
         Optional params:
-            
+
+            invisible
+            data
             softId
             callback
             proxy           =  {'type': 'HTTPS', 'uri': 'login:password@IP_address:PORT'})