* Objects/mappingobject.c (mappingremove): don't call

	lookmapping() for empty dictionary

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 89fd314ef4b52ceb856f78c3b1fc83b91e3bf9e2..bb4e051b1c7726de138f84be5c6f9a036284fee7 100644 (file)
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -322,8 +322,11 @@ mappingremove(op, key)
        if (hash == -1)
                return -1;
        mp = (mappingobject *)op;
+       if (((mappingobject *)op)->ma_table == NULL)
+               goto empty;
        ep = lookmapping(mp, key, hash);
        if (ep->me_value == NULL) {
+       empty:
                err_setval(KeyError, key);
                return -1;
        }

diff --git a/Objects/mappingobject.c b/Objects/mappingobject.c
index 89fd314ef4b52ceb856f78c3b1fc83b91e3bf9e2..bb4e051b1c7726de138f84be5c6f9a036284fee7 100644 (file)
--- a/Objects/mappingobject.c
+++ b/Objects/mappingobject.c
@@ -322,8 +322,11 @@ mappingremove(op, key)
        if (hash == -1)
                return -1;
        mp = (mappingobject *)op;
+       if (((mappingobject *)op)->ma_table == NULL)
+               goto empty;
        ep = lookmapping(mp, key, hash);
        if (ep->me_value == NULL) {
+       empty:
                err_setval(KeyError, key);
                return -1;
        }