* classobject.c: in instance_getattr, don't make a method out of a
  function found as instance data.
* socketmodule.c: added 'flags' argument sendto/recvfrom, rewrite
  argument parsing in send/recv.
* More changes related to access (terminology change: owner instead of
  class; allow any object as owner; local/global variables are owned
  by their dictionary, only class/instance data is owned by the class;
  "from...import *" now only imports objects with public access; etc.)
diff --git a/Python/import.c b/Python/import.c
index 395114b..b532651 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -303,7 +303,7 @@
 			}
 		}
 	}
-	v = eval_code(co, d, d, (object *)NULL, (object *)NULL);
+	v = eval_code(co, d, d, d, (object *)NULL);
 	DECREF(co);
 	return v;
 }
@@ -422,7 +422,7 @@
 		return -1;
 	if ((m = add_module(name)) == NULL ||
 	    (d = getmoduledict(m)) == NULL ||
-	    (v = eval_code(co, d, d, (object*)NULL, (object*)NULL)) == NULL) {
+	    (v = eval_code(co, d, d, d, (object*)NULL)) == NULL) {
 		DECREF(co);
 		return -1;
 	}