From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 5 Feb 2012 17:36:55 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?a=commitdiff_plain;h=933f6cee99a3dd33b67fe463f4499aa19e703f79;hp=ae10a0a1fb12d6f9c0ecdb250046ab75c322961e;p=wrw.git

Merge branch 'master' into python3
---

diff --git a/wrw/env.py b/wrw/env.py
index 6c7e859..56d040d 100644
--- a/wrw/env.py
+++ b/wrw/env.py
@@ -11,7 +11,7 @@ class stack(object):
 class environment(object):
     __slots__ = ["parent", "map"]
     def __init__(self, parent = None):
-        self.parent = None
+        self.parent = parent
         self.map = weakref.WeakKeyDictionary()
 
     def get(self, var):