Commits

Waldemar Kornewald committed 9f4cc0c Merge

Comments (0)

Files changed (2)

                          'The subprocess module will not work correctly.')
 
         try:
-            # Allow importing compiler/parser and _ssl modules (for https)
+            # Allow importing compiler/parser, _ssl (for https),
+            # _io for Python 2.7 io support on OS X
             dev_appserver.HardenedModulesHook._WHITE_LIST_C_MODULES.extend(
-                ('parser', '_ssl'))
+                ('parser', '_ssl', '_io'))
         except AttributeError:
             logging.warn('Could not patch modules whitelist. '
                          'The compiler and parser modules will not work and '
     try:
         from google.appengine.tools import dev_appserver
         from .boot import PROJECT_DIR
-        appconfig, unused = dev_appserver.LoadAppConfig(PROJECT_DIR, {})
+        appconfig = dev_appserver.LoadAppConfig(PROJECT_DIR, {})[0]
         appid = appconfig.application
     except ImportError, e:
         raise Exception('Could not get appid. Is your app.yaml file missing? '