1.1 --- a/micropython/common.py Wed Mar 23 00:58:57 2011 +0100
1.2 +++ b/micropython/common.py Wed Mar 23 01:40:27 2011 +0100
1.3 @@ -58,13 +58,16 @@
1.4 def __iter__(self):
1.5 return iter(self.keys())
1.6
1.7 + def __nonzero__(self):
1.8 + return self.objects != {}
1.9 +
1.10 # Set membership and comparisons.
1.11
1.12 def __hash__(self):
1.13 return hash(tuple(self.keys()))
1.14
1.15 - def cmp(self, other):
1.16 - return cmp(self.keys(), other.keys())
1.17 + def __eq__(self, other):
1.18 + return self.objects == other.objects
1.19
1.20 # Set methods.
1.21
1.22 @@ -138,10 +141,10 @@
1.23 members.
1.24 """
1.25
1.26 - combined = []
1.27 + combined = set([])
1.28 for i1 in l1:
1.29 for i2 in l2:
1.30 - combined.append(i1.merge(i2))
1.31 + combined.add(i1.merge(i2))
1.32 return combined
1.33
1.34 def deepen_mapping_dict(d):
2.1 --- a/micropython/report.py Wed Mar 23 00:58:57 2011 +0100
2.2 +++ b/micropython/report.py Wed Mar 23 01:40:27 2011 +0100
2.3 @@ -826,7 +826,8 @@
2.4 self._span_end()
2.5
2.6 def visitAssAttr(self, node):
2.7 - target_names = self.possible_accessor_types(node)
2.8 + target_names = ["%s%s" % (is_static and "class " or "", target_name)
2.9 + for target_name, is_static in self.possible_accessor_types(node)]
2.10 self._span_start("assattr")
2.11 self._accessor_start(target_names)
2.12 self.dispatch(node.expr)
2.13 @@ -911,7 +912,8 @@
2.14 self._visitBinary(node, "floordiv", "//")
2.15
2.16 def visitGetattr(self, node):
2.17 - target_names = self.possible_accessor_types(node)
2.18 + target_names = ["%s%s" % (is_static and "class " or "", target_name)
2.19 + for target_name, is_static in self.possible_accessor_types(node)]
2.20 self._span_start("getattr")
2.21 self._accessor_start(target_names)
2.22 self.dispatch(node.expr)