From: Lisandro Dalcin <dalcinl@gmail.com>
Date: Mon, 15 Mar 2010 14:51:11 +0000 (-0300)
Subject: trivial fix: | -> ||
X-Git-Tag: 0.13.beta0~282
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8cda398879121c3b593e5e3fac4d348594cf674b;p=cython.git

trivial fix: | -> ||
---

diff --git a/Cython/Compiler/PyrexTypes.py b/Cython/Compiler/PyrexTypes.py
index 08649240..afbca581 100755
--- a/Cython/Compiler/PyrexTypes.py
+++ b/Cython/Compiler/PyrexTypes.py
@@ -2490,7 +2490,7 @@ type_conversion_functions = """
 
 static CYTHON_INLINE int __Pyx_PyObject_IsTrue(PyObject* x) {
    if (x == Py_True) return 1;
-   else if ((x == Py_False) | (x == Py_None)) return 0;
+   else if ((x == Py_False) || (x == Py_None)) return 0;
    else return PyObject_IsTrue(x);
 }