diff --git a/ez_setup.py b/ez_setup.py index 1ff1d3e..440f7d3 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -216,10 +216,9 @@ def main(argv, version=DEFAULT_VERSION): os.unlink(egg) else: if setuptools.__version__ == '0.0.1': - print >>sys.stderr, ( - "You have an obsolete version of setuptools installed. Please\n" - "remove it from your system entirely before rerunning this script." - ) + print("You have an obsolete version of setuptools installed. Please\n" + "remove it from your system entirely before rerunning this script.", + file=sys.stderr) sys.exit(2) req = "setuptools>="+version @@ -238,8 +237,8 @@ def main(argv, version=DEFAULT_VERSION): from setuptools.command.easy_install import main main(argv) else: - print "Setuptools version",version,"or greater has been installed." - print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)' + print("Setuptools version",version,"or greater has been installed.") + print('(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)') def update_md5(filenames): """Update our built-in md5 registry""" @@ -262,7 +261,7 @@ def update_md5(filenames): match = re.search("\nmd5_data = {\n([^}]+)}", src) if not match: - print >>sys.stderr, "Internal error!" + print("Internal error!", file=sys.stderr) sys.exit(2) src = src[:match.start(1)] + repl + src[match.end(1):] @@ -275,10 +274,4 @@ def update_md5(filenames): if len(sys.argv)>2 and sys.argv[1]=='--md5update': update_md5(sys.argv[2:]) else: - main(sys.argv[1:]) - - - - - - + main(sys.argv[1:]) \ No newline at end of file diff --git a/recaptcha/client/captcha.py b/recaptcha/client/captcha.py index 156c6d4..5baf2d2 100644 --- a/recaptcha/client/captcha.py +++ b/recaptcha/client/captcha.py @@ -1,4 +1,4 @@ -import urllib2, urllib +import urllib.request, urllib.parse API_SSL_SERVER="https://www.google.com/recaptcha/api" API_SERVER="http://www.google.com/recaptcha/api" @@ -61,20 +61,20 @@ def submit (recaptcha_challenge_field, def encode_if_necessary(s): - if isinstance(s, unicode): + if isinstance(s, str): return s.encode('utf-8') return s - params = urllib.urlencode ({ + params = urllib.parse.urlencode ({ 'privatekey': encode_if_necessary(private_key), 'remoteip' : encode_if_necessary(remoteip), 'challenge': encode_if_necessary(recaptcha_challenge_field), 'response' : encode_if_necessary(recaptcha_response_field), }) - request = urllib2.Request ( + request = urllib.request.Request ( url = "http://%s/recaptcha/api/verify" % VERIFY_SERVER, - data = params, + data = params.encode('utf-8'), headers = { "Content-type": "application/x-www-form-urlencoded", "User-agent": "reCAPTCHA Python" @@ -82,20 +82,20 @@ def encode_if_necessary(s): ) if not proxy: - httpresp = urllib2.urlopen (request) + httpresp = urllib.request.urlopen (request) else: - opener = urllib2.build_opener( - urllib2.HTTPHandler(), - urllib2.HTTPSHandler(), - urllib2.ProxyHandler({'https': 'http://'+proxy, 'http': 'http://'+proxy})) + opener = urllib.request.build_opener( + urllib.request.HTTPHandler(), + urllib.request.HTTPSHandler(), + urllib.request.ProxyHandler({'https': 'http://'+proxy, 'http': 'http://'+proxy})) httpresp = opener.open(request); - return_values = httpresp.read ().splitlines (); - httpresp.close(); + return_values = httpresp.read().splitlines() + httpresp.close() - return_code = return_values [0] + return_code = return_values[0].decode() if (return_code == "true"): return RecaptchaResponse (is_valid=True) else: - return RecaptchaResponse (is_valid=False, error_code = return_values [1]) + return RecaptchaResponse (is_valid=False, error_code = return_values[1].decode()) \ No newline at end of file diff --git a/setup.py b/setup.py index 23cf0fe..25212e3 100755 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ from setuptools import setup, find_packages setup(name='recaptcha-client', - version='1.0.6', + version='2.0.0', url = "http://recaptcha.net", author = "Ben Maurer", author_email = "support@recaptcha.net",