From: Hynek Schlawack <hs@ox.cx>
Date: Fri, 22 Jun 2012 07:32:22 +0000 (+0200)
Subject: Simplify code in fileio_init
X-Git-Tag: v3.3.0b1~163
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f59fd7c7c3315c52034b09ffadeb974bc112b5d;p=thirdparty%2FPython%2Fcpython.git

Simplify code in fileio_init

If an identical code line is in both at the end of if and else, it can as well
stand after the block. :) The code is from 464cf523485e, I didn't see it before
checking the commits in the web interface of course.
---

diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
index 31e2994a0e49..226a5d275058 100644
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -377,7 +377,6 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds)
 #endif
                 self->fd = open(name, flags, 0666);
             Py_END_ALLOW_THREADS
-            fd_is_own = 1;
         } else {
             PyObject *fdobj = PyObject_CallFunction(
                                   opener, "Oi", nameobj, flags);
@@ -395,9 +394,9 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds)
             if (self->fd == -1) {
                 goto error;
             }
-            fd_is_own = 1;
         }
 
+        fd_is_own = 1;
         if (self->fd < 0) {
 #ifdef MS_WINDOWS
             if (widename != NULL)