# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1507329467 -7200
# Node ID d7a3053f4e7e5ee48c4cbbc4ce9cd675667427f7
# Parent  c7204b035e66a8e0206e5317c9d1d03f3ffcfdfa
Moved editing state into the resource object from the environment.

diff -r c7204b035e66 -r d7a3053f4e7e imipweb/env.py
--- a/imipweb/env.py	Fri Oct 06 23:19:20 2017 +0200
+++ b/imipweb/env.py	Sat Oct 07 00:37:47 2017 +0200
@@ -37,10 +37,6 @@
         self.user = None
         self.query_string = None
 
-        # Retain computed state.
-
-        self.state = {}
-
     def get_args(self):
         if self.args is None:
             if self.get_method() != "POST":
@@ -95,7 +91,4 @@
         path = self.get_path()
         return "%s/%s" % (path.rstrip("/"), path_info.lstrip("/"))
 
-    def get_state(self):
-        return self.state
-
 # vim: tabstop=4 expandtab shiftwidth=4
diff -r c7204b035e66 -r d7a3053f4e7e imipweb/event.py
--- a/imipweb/event.py	Fri Oct 06 23:19:20 2017 +0200
+++ b/imipweb/event.py	Sat Oct 07 00:37:47 2017 +0200
@@ -1158,10 +1158,9 @@
         compute and return the state using 'fn' regardless of existing state.
         """
 
-        state = self.env.get_state()
-        if overwrite or not state.has_key(key):
-            state[key] = fn()
-        return state[key]
+        if overwrite or not self.state.has_key(key):
+            self.state[key] = fn()
+        return self.state[key]
 
     def set_state(self, key, value):
 
@@ -1170,7 +1169,7 @@
         existing state with the given 'value'.
         """
 
-        self.env.get_state()[key] = value
+        self.state[key] = value
 
     def get_current_main_period(self):
 
diff -r c7204b035e66 -r d7a3053f4e7e imipweb/resource.py
--- a/imipweb/resource.py	Fri Oct 06 23:19:20 2017 +0200
+++ b/imipweb/resource.py	Sat Oct 07 00:37:47 2017 +0200
@@ -56,6 +56,10 @@
         self.page = resource and resource.page or markup.page()
         self.html_ids = None
 
+        # Computed state.
+
+        self.state = {}
+
     # Presentation methods.
 
     def new_page(self, title):