← Back to branch summary

~ubuntu-branches/ubuntu/natty/python3.1/natty-security

« back to all changes in this revision

Viewing changes to Modules/_io/bufferedio.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2010-07-06 16:52:42 UTC
  • mfrom: (1.2.1 upstream) (2.1.11 sid)
  • Revision ID: james.westby@ubuntu.com-20100706165242-2xv4i019r3et6c0j
Tags: 3.1.2+20100706-1ubuntu1
* Merge with Debian; remaining changes:
  - Regenerate the control file.
  - Add debian/patches/overwrite-semaphore-check for Lucid buildds.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Modules/_io/bufferedio.c
438
438
    res = PyObject_CallMethodObjArgs((PyObject *)self, _PyIO_str_flush, NULL);
439
439
    ENTER_BUFFERED(self)
440
440
    if (res == NULL) {
441
 
        /* If flush() fails, just give up */
442
 
        if (PyErr_ExceptionMatches(PyExc_IOError))
443
 
            PyErr_Clear();
444
 
        else
445
 
            goto end;
 
441
        goto end;
446
442
    }
447
443
    Py_XDECREF(res);
448
444