From f9afeb51f8f40fc4c651f29f4bd8e13458ff3217 Mon Sep 17 00:00:00 2001
From: Michele Comitini <mcm@glisco.it>
Date: Tue, 28 Aug 2012 00:25:22 +0200
Subject: [PATCH] always use dict for environment

---
 gluon/main.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gluon/main.py b/gluon/main.py
index 29a17992..7f95ecb0 100644
--- a/gluon/main.py
+++ b/gluon/main.py
@@ -209,8 +209,7 @@ def serve_controller(request, response, session):
     page = run_controller_in(request.controller, request.function, environment)
     if isinstance(page, dict):
         response._vars = page
-        for key in page:
-            response._view_environment[key] = page[key]
+        response._view_environment.update(page)
         run_view_in(response._view_environment)
         page = response.body.getvalue()
     # logic to garbage collect after exec, not always, once every 100 requests