Merge pull request #436 from reedkavner/gae-development

Update GAE environ test

Author: jeremylow

twitter/api.py

@@ -210,7 +210,7 @@ def __init__(self,
         # check to see if the library is running on a Google App Engine instance
         # see GAE.rst for more information
         if os.environ:
-            if 'Google App Engine' in os.environ.get('SERVER_SOFTWARE', ''):
+            if 'APPENGINE_RUNTIME' in os.environ.keys():
                 import requests_toolbelt.adapters.appengine  # Adapter ensures requests use app engine's urlfetch
                 requests_toolbelt.adapters.appengine.monkeypatch()
                 cache = None  # App Engine does not like this caching strategy, disable caching