Merge pull request #7 from ryuslash/use-python-requests

Use python requests
mozilla · Jun 28, 2012 · 6b5292f · 6b5292f
2 parents 503c759 + 5328f87
commit 6b5292f
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 21 deletions.
diff --git a/python/django/README.md b/python/django/README.md
@@ -1,6 +1,7 @@
 # Python django example
 
-This example was written using django 1.4.
+This example was written using [django](http://www.djangoproject.com)
+1.4 and [Requests](http://python-requests.org).
 
 To run this example:
 

diff --git a/python/django/example/browserid/views.py b/python/django/example/browserid/views.py
@@ -1,6 +1,4 @@
-import urllib
-import urllib2
-import json
+import requests
 
 from django.shortcuts import render_to_response
 from django.http import HttpResponseRedirect
@@ -11,9 +9,19 @@ def status(request):
 
     audience = 'http://localhost:8000'
     assertion = request.POST['assertion']
-    page = urllib2.urlopen('https://browserid.org/verify',
-                           urllib.urlencode({ "assertion": assertion,
-                                              "audience": audience}))
-    data = json.load(page)
+
+    try:
+        page = requests.post('https://browserid.org/verify',
+                             verify=True,
+                             data={ "assertion": assertion,
+                                    "audience": audience})
+        data = page.json
+    except requests.exceptions.SSLError:
+        data = { "status": "failed",
+                 "reason": "Could not verify SSL certificate" }
+    except requests.exceptions.ConnectionError:
+        data = { "status": "failed",
+                 "reason": "Could not connect to server" }
+
 
     return render_to_response('status.html', { 'data': data })
diff --git a/python/python.cgi b/python/python.cgi
@@ -1,10 +1,8 @@
 #!/usr/bin/python
 
 import cgi
-import json
 import os
-import urllib
-import urllib2
+import requests
 
 def print_login_form():
     print """<html>
@@ -38,10 +36,21 @@ def verify_assertion(assertion):
     if 'HTTPS' in os.environ:
         audience = 'https://'
     audience += os.environ['SERVER_NAME'] + ':' + os.environ['SERVER_PORT']
-    postdata = urllib.urlencode({"assertion": assertion, "audience": audience})
 
-    page = urllib2.urlopen('https://browserid.org/verify', postdata)
-    return json.load(page)
+    try:
+        page = requests.post('https://browserid.org/verify',
+                             verify=True,
+                             data={ "assertion": assertion,
+                                    "audience": audience})
+        data = page.json
+    except requests.exceptions.SSLError:
+        data = { "status": "failed",
+                 "reason": "Could not verify SSL certificate" }
+    except requests.exceptions.ConnectionError:
+        data = { "status": "failed",
+                 "reason": "Could not connect to server" }
+
+    return data
 
 print 'Content-type: text/html\n\n'
 

diff --git a/python/web.py/browserid.py b/python/web.py/browserid.py
@@ -1,9 +1,7 @@
 #!/usr/bin/python2
 
 import web
-import urllib
-import urllib2
-import json
+import requests
 
 urls = (
     '/', 'index',
@@ -21,10 +19,19 @@ class status:
     def POST(self):
         audience = "http://localhost:8080"
         i = web.input()
-        page = urllib2.urlopen('https://browserid.org/verify',
-                               urllib.urlencode({ "assertion": i.assertion,
-                                                  "audience": audience }))
-        data = json.load(page)
+
+        try:
+            page = requests.post('https://browserid.org/verify',
+                                 verify=True,
+                                 data={ "assertion": i.assertion,
+                                        "audience": audience})
+            data = page.json
+        except requests.exceptions.SSLError:
+            data = { "status": "failed",
+                     "reason": "Could not verify SSL certificate" }
+        except requests.exceptions.ConnectionError:
+            data = { "status": "failed",
+                     "reason": "Could not connect to server" }
 
         if data['status'] == "okay":
             message = "Logged in as: %s" % data['email']