Merge pull request #14 from 2captcha/updates

Updates

Author: 2captcha

README.md

@@ -43,20 +43,22 @@ Also there are few options that can be configured:
 
 ```python 
 config = {
-    		'apiKey':           'YOUR_API_KEY',
-    		'softId':            123,
-    		'callback':         'https://your.site/result-receiver',
-    		'defaultTimeout':    120,
-    		'recaptchaTimeout':  600,
-    		'pollingInterval':   10,
-	    }
+            'server':           '2captcha.com',
+            'apiKey':           'YOUR_API_KEY',
+            'softId':            123,
+            'callback':         'https://your.site/result-receiver',
+            'defaultTimeout':    120,
+            'recaptchaTimeout':  600,
+            'pollingInterval':   10,
+        }
 solver = TwoCaptcha(**config)
 ```
 
 ### TwoCaptcha instance options
 
 |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

examples/canvas.py

@@ -3,6 +3,12 @@
 sys.path.append(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
 from twocaptcha import TwoCaptcha
 
+# in this example we store the API key inside environment variables that can be set like:
+# export APIKEY_2CAPTCHA=1abc234de56fab7c89012d34e56fa7b8 on Linux or macOS
+# set APIKEY_2CAPTCHA=1abc234de56fab7c89012d34e56fa7b8 on Windows
+# you can just set the API key directly to it's value like:
+# api_key="1abc234de56fab7c89012d34e56fa7b8"
+
 api_key = os.getenv('APIKEY_2CAPTCHA', 'YOUR_API_KEY')
 
 solver = TwoCaptcha(api_key)
@@ -14,4 +20,4 @@
     sys.exit(e)
 
 else:
-    sys.exit('solved: ' + str(result))
+    sys.exit('result: ' + str(result))

examples/canvas_base64.py

@@ -5,6 +5,12 @@
 sys.path.append(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
 from twocaptcha import TwoCaptcha
 
+# in this example we store the API key inside environment variables that can be set like:
+# export APIKEY_2CAPTCHA=1abc234de56fab7c89012d34e56fa7b8 on Linux or macOS
+# set APIKEY_2CAPTCHA=1abc234de56fab7c89012d34e56fa7b8 on Windows
+# you can just set the API key directly to it's value like:
+# api_key="1abc234de56fab7c89012d34e56fa7b8"
+
 api_key = os.getenv('APIKEY_2CAPTCHA', 'YOUR_API_KEY')
 
 solver = TwoCaptcha(api_key)
@@ -19,4 +25,4 @@
     sys.exit(e)
 
 else:
-    sys.exit('solved: ' + str(result))
+    sys.exit('result: ' + str(result))

examples/canvas_options.py

@@ -4,9 +4,15 @@
 
 from twocaptcha import TwoCaptcha
 
+# in this example we store the API key inside environment variables that can be set like:
+# export APIKEY_2CAPTCHA=1abc234de56fab7c89012d34e56fa7b8 on Linux or macOS
+# set APIKEY_2CAPTCHA=1abc234de56fab7c89012d34e56fa7b8 on Windows
+# you can just set the API key directly to it's value like:
+# api_key="1abc234de56fab7c89012d34e56fa7b8"
+
 api_key = os.getenv('APIKEY_2CAPTCHA', 'YOUR_API_KEY')
 
-solver = TwoCaptcha(api_key, defaultTimeout=120, pollingInterval=5)
+solver = TwoCaptcha(api_key, defaultTimeout=120, pollingInterval=5, server='2captcha.com')
 
 try:
     result = solver.canvas(
@@ -16,11 +22,10 @@
         lang='en',
         hintImg='./images/canvas_hint.jpg',
         hintText='Draw around apple',
-        #    callback='http://127.0.0.1/test/'
     )
 
-except Exception as e:
+except Exception as e:  
     sys.exit(e)
 
 else:
-    sys.exit('sent: ' + str(result))
+    sys.exit('result: ' + str(result))

examples/capy.py

@@ -4,6 +4,12 @@
 
 from twocaptcha import TwoCaptcha
 
+# in this example we store the API key inside environment variables that can be set like:
+# export APIKEY_2CAPTCHA=1abc234de56fab7c89012d34e56fa7b8 on Linux or macOS
+# set APIKEY_2CAPTCHA=1abc234de56fab7c89012d34e56fa7b8 on Windows
+# you can just set the API key directly to it's value like:
+# api_key="1abc234de56fab7c89012d34e56fa7b8"
+
 api_key = os.getenv('APIKEY_2CAPTCHA', 'YOUR_API_KEY')
 
 solver = TwoCaptcha(api_key)
@@ -19,4 +25,4 @@
     sys.exit(e)
 
 else:
-    sys.exit('solved: ' + str(result))
+    sys.exit('result: ' + str(result))

examples/capy_options.py

@@ -4,6 +4,12 @@
 
 from twocaptcha import TwoCaptcha
 
+# in this example we store the API key inside environment variables that can be set like:
+# export APIKEY_2CAPTCHA=1abc234de56fab7c89012d34e56fa7b8 on Linux or macOS
+# set APIKEY_2CAPTCHA=1abc234de56fab7c89012d34e56fa7b8 on Windows
+# you can just set the API key directly to it's value like:
+# api_key="1abc234de56fab7c89012d34e56fa7b8"
+
 api_key = os.getenv('APIKEY_2CAPTCHA', 'YOUR_API_KEY')
 
 solver = TwoCaptcha(api_key, defaultTimeout=30, pollingInterval=5)
@@ -18,4 +24,4 @@
     sys.exit(e)
 
 else:
-    sys.exit('solved: ' + str(result))
+    sys.exit('result: ' + str(result))

examples/coordinates.py

@@ -4,6 +4,12 @@
 
 from twocaptcha import TwoCaptcha
 
+# in this example we store the API key inside environment variables that can be set like:
+# export APIKEY_2CAPTCHA=1abc234de56fab7c89012d34e56fa7b8 on Linux or macOS
+# set APIKEY_2CAPTCHA=1abc234de56fab7c89012d34e56fa7b8 on Windows
+# you can just set the API key directly to it's value like:
+# api_key="1abc234de56fab7c89012d34e56fa7b8"
+
 api_key = os.getenv('APIKEY_2CAPTCHA', 'YOUR_API_KEY')
 
 solver = TwoCaptcha(api_key)
@@ -15,4 +21,4 @@
     sys.exit(e)
 
 else:
-    sys.exit('solved: ' + str(result))
+    sys.exit('result: ' + str(result))

examples/coordinates_base64.py

@@ -6,6 +6,12 @@
 
 from twocaptcha import TwoCaptcha
 
+# in this example we store the API key inside environment variables that can be set like:
+# export APIKEY_2CAPTCHA=1abc234de56fab7c89012d34e56fa7b8 on Linux or macOS
+# set APIKEY_2CAPTCHA=1abc234de56fab7c89012d34e56fa7b8 on Windows
+# you can just set the API key directly to it's value like:
+# api_key="1abc234de56fab7c89012d34e56fa7b8"
+
 api_key = os.getenv('APIKEY_2CAPTCHA', 'YOUR_API_KEY')
 
 solver = TwoCaptcha(api_key)
@@ -20,4 +26,4 @@
     sys.exit(e)
 
 else:
-    sys.exit('solved: ' + str(result))
+    sys.exit('result: ' + str(result))

examples/coordinates_options.py

@@ -5,6 +5,12 @@
 
 from twocaptcha import TwoCaptcha
 
+# in this example we store the API key inside environment variables that can be set like:
+# export APIKEY_2CAPTCHA=1abc234de56fab7c89012d34e56fa7b8 on Linux or macOS
+# set APIKEY_2CAPTCHA=1abc234de56fab7c89012d34e56fa7b8 on Windows
+# you can just set the API key directly to it's value like:
+# api_key="1abc234de56fab7c89012d34e56fa7b8"
+
 api_key = os.getenv('APIKEY_2CAPTCHA', 'YOUR_API_KEY')
 
 solver = TwoCaptcha(api_key, defaultTimeout=120, pollingInterval=5)
@@ -18,4 +24,4 @@
     sys.exit(e)
 
 else:
-    sys.exit('solved: ' + str(result))
+    sys.exit('result: ' + str(result))

examples/funcaptcha.py

@@ -4,6 +4,12 @@
 
 from twocaptcha import TwoCaptcha
 
+# in this example we store the API key inside environment variables that can be set like:
+# export APIKEY_2CAPTCHA=1abc234de56fab7c89012d34e56fa7b8 on Linux or macOS
+# set APIKEY_2CAPTCHA=1abc234de56fab7c89012d34e56fa7b8 on Windows
+# you can just set the API key directly to it's value like:
+# api_key="1abc234de56fab7c89012d34e56fa7b8"
+
 api_key = os.getenv('APIKEY_2CAPTCHA', 'YOUR_API_KEY')
 
 solver = TwoCaptcha(api_key)
@@ -17,4 +23,4 @@
     sys.exit(e)
 
 else:
-    sys.exit('solved: ' + str(result))
+    sys.exit('result: ' + str(result))