Merge pull request #761 from goodfeli/fix_24

theano/compile/function_module.py

@@ -954,21 +954,20 @@ class FunctionMaker(object):
         elif isinstance(sinput, SymbolicInput):
             return [None, [sinput]]
 
-    @property
-    def env(self):
+    def env_getter(self):
         warnings.warn("FunctionMaker.env is deprecated, it has been renamed 'fgraph'")
         return self.fgraph
 
-    @env.setter
-    def env(self,value):
+    def env_setter(self,value):
         warnings.warn("FunctionMaker.env is deprecated, it has been renamed 'fgraph'")
         self.fgraph = value
 
-    @env.deleter
-    def env(self):
+    def env_deleter(self):
         warnings.warn("FunctionMaker.env is deprecated, it has been renamed 'fgraph'")
         del self.fgraph
 
+    env = property(env_getter, env_setter, env_deleter)
+
 
     @staticmethod
     def wrap_out(output):

theano/gof/graph.py

@@ -121,21 +121,20 @@ class Apply(utils.object2):
         return self.outputs[do]
 
 
-    @property
-    def env(self):
+    def env_getter(self):
         warnings.warn("Apply.env is deprecated, it has been renamed 'fgraph'")
         return self.fgraph
 
-    @env.setter
-    def env(self,value):
+    def env_setter(self,value):
         warnings.warn("Apply.env is deprecated, it has been renamed 'fgraph'")
         self.fgraph = value
 
-    @env.deleter
-    def env(self):
+    def env_deleter(self):
         warnings.warn("Apply.env is deprecated, it has been renamed 'fgraph'")
         del self.fgraph
 
+    env = property(env_getter, env_setter, env_deleter)
+
 
     out = property(default_output,
                    doc = "alias for self.default_output()")
@@ -357,21 +356,20 @@ class Variable(utils.object2):
                                   self.__class__.__name__)
 
 
-    @property
-    def env(self):
+    def env_getter(self):
         warnings.warn("Variable.env is deprecated, it has been renamed 'fgraph'")
         return self.fgraph
 
-    @env.setter
-    def env(self,value):
+    def env_setter(self,value):
         warnings.warn("Variable.env is deprecated, it has been renamed 'fgraph'")
         self.fgraph = value
 
-    @env.deleter
-    def env(self):
+    def env_deleter(self):
         warnings.warn("Variable.env is deprecated, it has been renamed 'fgraph'")
         del self.fgraph
 
+    env = property(env_getter, env_setter, env_deleter)
+
 
 
 class Constant(Variable):