1.1 --- a/viewer.py Sat Jan 06 00:45:33 2007 +0100
1.2 +++ b/viewer.py Sun Jan 07 20:09:39 2007 +0100
1.3 @@ -879,12 +879,24 @@
1.4 self.stream.write("</div>\n")
1.5 self.stream.write("</div>\n")
1.6 else:
1.7 - if hasattr(node, "writes") and node.writes or hasattr(node, "accesses") and node.accesses:
1.8 + if hasattr(node, "accesses") and node.accesses:
1.9 self.stream.write("<div class='scopes'>\n")
1.10 - for ref in getattr(node, "writes", getattr(node, "accesses", {})).keys():
1.11 + for ref, accesses in node.accesses.items():
1.12 + fn = ref.full_name()
1.13 + for attr, access in accesses:
1.14 + access_fn = access.full_name()
1.15 + self.stream.write("<div class='scope'>")
1.16 + self.stream.write(self._text(fn))
1.17 + if ref != access:
1.18 + self.stream.write(" (via " + self._text(access_fn) + ")")
1.19 + self.stream.write("</div>\n")
1.20 + self.stream.write("</div>\n")
1.21 + if hasattr(node, "writes") and node.writes:
1.22 + self.stream.write("<div class='scopes'>\n")
1.23 + for ref in node.writes.keys():
1.24 fn = ref.full_name()
1.25 self.stream.write("<div class='scope'>")
1.26 - self.stream.write(self._text(fn))
1.27 + self.stream.write(self._text(fn))
1.28 self.stream.write("</div>\n")
1.29 self.stream.write("</div>\n")
1.30 if hasattr(node, "non_accesses") and node.non_accesses: