1.1 --- a/fixnames.py Sat Oct 14 02:17:40 2006 +0200
1.2 +++ b/fixnames.py Sun Oct 15 01:03:44 2006 +0200
1.3 @@ -248,7 +248,7 @@
1.4
1.5 if scope == "structure":
1.6 result = self.dispatch(
1.7 - LoadAttr(loadname.original,
1.8 + LoadAttr(loadname.original, loadname.defining,
1.9 expr=LoadRef(loadname.original,
1.10 ref=self.namespace.structure),
1.11 name=loadname.name,
1.12 @@ -269,7 +269,7 @@
1.13
1.14 if scope == "global":
1.15 result = self.dispatch(
1.16 - LoadAttr(loadname.original,
1.17 + LoadAttr(loadname.original, loadname.defining,
1.18 expr=LoadRef(loadname.original,
1.19 ref=self.builtins),
1.20 name=loadname.name,
1.21 @@ -281,7 +281,7 @@
1.22
1.23 else:
1.24 result = self.dispatch(
1.25 - LoadAttr(loadname.original,
1.26 + LoadAttr(loadname.original, loadname.defining,
1.27 expr=LoadRef(loadname.original,
1.28 ref=self.module),
1.29 name=loadname.name,
1.30 @@ -293,7 +293,7 @@
1.31
1.32 else:
1.33 result = self.dispatch(
1.34 - LoadAttr(loadname.original,
1.35 + LoadAttr(loadname.original, loadname.defining,
1.36 expr=LoadRef(loadname.original,
1.37 ref=self.builtins),
1.38 name=loadname.name,
1.39 @@ -314,7 +314,7 @@
1.40
1.41 else:
1.42 result = self.dispatch(
1.43 - LoadAttr(loadname.original,
1.44 + LoadAttr(loadname.original, loadname.defining,
1.45 expr=LoadRef(loadname.original,
1.46 ref=self.module),
1.47 name=loadname.name,
1.48 @@ -333,7 +333,7 @@
1.49
1.50 if scope == "structure":
1.51 return self.dispatch(
1.52 - StoreAttr(storename.original,
1.53 + StoreAttr(storename.original, storename.defining,
1.54 lvalue=LoadRef(storename.original,
1.55 ref=self.namespace.structure),
1.56 name=storename.name,
1.57 @@ -346,7 +346,7 @@
1.58
1.59 elif scope == "global":
1.60 return self.dispatch(
1.61 - StoreAttr(storename.original,
1.62 + StoreAttr(storename.original, storename.defining,
1.63 lvalue=LoadRef(storename.original,
1.64 ref=self.module),
1.65 name=storename.name,
1.66 @@ -369,7 +369,7 @@
1.67
1.68 else:
1.69 return self.dispatch(
1.70 - StoreAttr(storename.original,
1.71 + StoreAttr(storename.original, storename.defining,
1.72 lvalue=LoadRef(storename.original,
1.73 ref=self.module),
1.74 name=storename.name,