1.1 --- a/imipweb/env.py Fri Oct 06 23:20:25 2017 +0200
1.2 +++ b/imipweb/env.py Sat Oct 07 00:39:09 2017 +0200
1.3 @@ -37,10 +37,6 @@
1.4 self.user = None
1.5 self.query_string = None
1.6
1.7 - # Retain computed state.
1.8 -
1.9 - self.state = {}
1.10 -
1.11 def get_args(self):
1.12 if self.args is None:
1.13 if self.get_method() != "POST":
1.14 @@ -95,7 +91,4 @@
1.15 path = self.get_path()
1.16 return "%s/%s" % (path.rstrip("/"), path_info.lstrip("/"))
1.17
1.18 - def get_state(self):
1.19 - return self.state
1.20 -
1.21 # vim: tabstop=4 expandtab shiftwidth=4
2.1 --- a/imipweb/event.py Fri Oct 06 23:20:25 2017 +0200
2.2 +++ b/imipweb/event.py Sat Oct 07 00:39:09 2017 +0200
2.3 @@ -1152,10 +1152,9 @@
2.4 compute and return the state using 'fn' regardless of existing state.
2.5 """
2.6
2.7 - state = self.env.get_state()
2.8 - if overwrite or not state.has_key(key):
2.9 - state[key] = fn()
2.10 - return state[key]
2.11 + if overwrite or not self.state.has_key(key):
2.12 + self.state[key] = fn()
2.13 + return self.state[key]
2.14
2.15 def set_state(self, key, value):
2.16
2.17 @@ -1164,7 +1163,7 @@
2.18 existing state with the given 'value'.
2.19 """
2.20
2.21 - self.env.get_state()[key] = value
2.22 + self.state[key] = value
2.23
2.24 def get_current_main_period(self):
2.25
3.1 --- a/imipweb/resource.py Fri Oct 06 23:20:25 2017 +0200
3.2 +++ b/imipweb/resource.py Sat Oct 07 00:39:09 2017 +0200
3.3 @@ -56,6 +56,10 @@
3.4 self.page = resource and resource.page or markup.page()
3.5 self.html_ids = None
3.6
3.7 + # Computed state.
3.8 +
3.9 + self.state = {}
3.10 +
3.11 # Presentation methods.
3.12
3.13 def new_page(self, title):