Skip to content

chore: add python 3.8 support #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lautarongc wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: add python 3.8 support #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 7 additions & 14 deletions ez_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"""
Expand All @@ -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):]
Expand All @@ -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:])
28 changes: 14 additions & 14 deletions recaptcha/client/captcha.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -61,41 +61,41 @@ 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"
}
)

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())
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down