From f3f8b4f7b1828ddf75706a0366ff92f8c3f87060 Mon Sep 17 00:00:00 2001
From: Emanuele Pucciarelli <ep@acm.org>
Date: Thu, 9 Jul 2015 01:26:13 +0200
Subject: [PATCH 1/2] Import webapp2 instead of google.appengine.ext.webapp

This choice is apparently more robust in situations / runtimes where the import mechanism in google/appengine/ext/webapp/__init__.py does not appear to do the right thing.
---
 oauth2client/appengine.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oauth2client/appengine.py b/oauth2client/appengine.py
index 00fe9855d..7888a0d04 100644
--- a/oauth2client/appengine.py
+++ b/oauth2client/appengine.py
@@ -27,12 +27,12 @@
 import threading
 
 import httplib2
+import webapp2 as webapp
 
 from google.appengine.api import app_identity
 from google.appengine.api import memcache
 from google.appengine.api import users
 from google.appengine.ext import db
-from google.appengine.ext import webapp
 from google.appengine.ext.webapp.util import login_required
 from google.appengine.ext.webapp.util import run_wsgi_app
 from oauth2client import GOOGLE_AUTH_URI

From d2c15e6347b7099783e064e1db2dece10cb9b600 Mon Sep 17 00:00:00 2001
From: Emanuele Pucciarelli <ep@acm.org>
Date: Thu, 9 Jul 2015 11:27:59 +0200
Subject: [PATCH 2/2] Add webapp2 to the docs test environment

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index 54f6c333d..6d7beb1f5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -45,6 +45,7 @@ deps =
     pyyaml
     sphinx>=1.3b2
     sphinx-rtd-theme
+    webapp2
 commands = {toxinidir}/scripts/build-docs
 
 [testenv:pushdocs]