From 795ba583f263f240ec30e2021f3f49622e8ff78f Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Thu, 23 May 1996 22:49:07 +0000 Subject: Removed some redundant header includes. dir(object) now returns object.__dict__.keys() even if __dict__ is not a dictionary. --- Python/bltinmodule.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index a09cd6f..0eedb65 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -28,12 +28,8 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "node.h" #include "graminit.h" -#include "sysmodule.h" #include "bltinmodule.h" #include "import.h" -#include "pythonrun.h" -#include "ceval.h" -#include "modsupport.h" #include "compile.h" #include "eval.h" @@ -356,7 +352,11 @@ builtin_dir(self, args) } } else { - v = newlistobject(0); + v = PyObject_CallMethod(d, "keys", NULL); + if (v == NULL) { + PyErr_Clear(); + v = newlistobject(0); + } } DECREF(d); return v; -- cgit v0.12