Merge pull request #217 from puccia/patch-3

Import webapp2 instead of google.appengine.ext.webapp
googleapis · Jul 9, 2015 · fe246ba · fe246ba
2 parents f46290a + d2c15e6
commit fe246ba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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

diff --git 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]