[Python-3000-checkins] r62871 - python/branches/py3k/Objects/setobject.c

[Guido van Rossum]

Would the regular merge not have picked this up?

On Thu, May 8, 2008 at 9:02 AM, raymond.hettinger
<python-3000-checkins at python.org> wrote:
> Author: raymond.hettinger
>  Date: Thu May  8 18:02:10 2008
>  New Revision: 62871
>
>  Log:
>  Forward port r62848.
>
>  Modified:
>    python/branches/py3k/Objects/setobject.c
>
>  Modified: python/branches/py3k/Objects/setobject.c
>  ==============================================================================
>  --- python/branches/py3k/Objects/setobject.c    (original)
>  +++ python/branches/py3k/Objects/setobject.c    Thu May  8 18:02:10 2008
>  @@ -1743,7 +1743,7 @@
>
>         rv = set_contains_key(so, key);
>         if (rv == -1) {
>  -               if (!PyAnySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError))
>  +               if (!PySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError))
>                         return -1;
>                 PyErr_Clear();
>                 tmpkey = make_new_set(&PyFrozenSet_Type, NULL);
>  @@ -1778,7 +1778,7 @@
>
>         rv = set_discard_key(so, key);
>         if (rv == -1) {
>  -               if (!PyAnySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError))
>  +               if (!PySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError))
>                         return NULL;
>                 PyErr_Clear();
>                 tmpkey = make_new_set(&PyFrozenSet_Type, NULL);
>  @@ -1809,7 +1809,7 @@
>
>         rv = set_discard_key(so, key);
>         if (rv == -1) {
>  -               if (!PyAnySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError))
>  +               if (!PySet_Check(key) || !PyErr_ExceptionMatches(PyExc_TypeError))
>                         return NULL;
>                 PyErr_Clear();
>                 tmpkey = make_new_set(&PyFrozenSet_Type, NULL);
>  _______________________________________________
>  Python-3000-checkins mailing list
>  Python-3000-checkins at python.org
>  http://mail.python.org/mailman/listinfo/python-3000-checkins
>



-- 
--Guido van Rossum (home page: http://www.python.org/~guido/)