[Python-bugs-list] PRIVATE: temporary glitch in CVS codecs.c (PR#302)

[Guido van Rossum]

> In the CVS tree as of this morning, the following snippet accidentally got
> checked in to CVS.
> 
> I'm sure someone will notice this anyway soon - just wanted to send a heads up.
> 
> --Brian Hooper
> 
>         if (func == NULL)
>             goto onError;
> <<<<<<< codecs.c
>         result = PyEval_CallObject(func, args);
> =======
>         result = PyEval_CallObject(func, args);
> >>>>>>> 2.3
>         if (result == NULL)

Are you sure?  I don't see this in in our CVS repository.  What does
"cvs update codecs.c" tell you?

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