From: Brian Curtin <brian@python.org>
Date: Mon, 7 Nov 2011 16:51:18 +0000 (-0600)
Subject: Adjust None handling to be a bit more clean. Thanks to Benjamin
X-Git-Tag: v3.3.0a1~916
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0d5b5d3b2a3a9047e3fe87c118e723c5876b92a;p=thirdparty%2FPython%2Fcpython.git

Adjust None handling to be a bit more clean. Thanks to Benjamin
for pointing it out.
---

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 2e33022af8e4..5ca9e95c6704 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -3543,7 +3543,7 @@ static PyObject *
 posix_utime(PyObject *self, PyObject *args)
 {
 #ifdef MS_WINDOWS
-    PyObject *arg = NULL;
+    PyObject *arg = Py_None;
     PyObject *obwpath;
     wchar_t *wpath = NULL;
     PyObject *oapath;
@@ -3589,7 +3589,7 @@ posix_utime(PyObject *self, PyObject *args)
         Py_DECREF(oapath);
     }
 
-    if (!arg || (arg == Py_None)) {
+    if (arg == Py_None) {
         SYSTEMTIME now;
         GetSystemTime(&now);
         if (!SystemTimeToFileTime(&now, &mtime) ||
@@ -3633,13 +3633,13 @@ done:
     time_t atime, mtime;
     long ausec, musec;
     int res;
-    PyObject* arg = NULL;
+    PyObject* arg = Py_None;
 
     if (!PyArg_ParseTuple(args, "O&|O:utime",
                           PyUnicode_FSConverter, &opath, &arg))
         return NULL;
     path = PyBytes_AsString(opath);
-    if (!arg || (arg == Py_None)) {
+    if (arg == Py_None) {
         /* optional time values not given */
         Py_BEGIN_ALLOW_THREADS
         res = utime(path, NULL);