From: R David Murray <rdmurray@bitdance.com>
Date: Wed, 20 Mar 2013 04:15:20 +0000 (-0400)
Subject: Use logic operator, not bitwise operator, for conditional.
X-Git-Tag: v3.4.0a1~1140
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a7d3768a3458031c8df2de0250ba7d1dfa6a391;p=thirdparty%2FPython%2Fcpython.git

Use logic operator, not bitwise operator, for conditional.
---

diff --git a/Modules/_csv.c b/Modules/_csv.c
index 39f9d7d377e6..22ac2667ff0a 100644
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -644,7 +644,7 @@ parse_process_char(ReaderObj *self, Py_UCS4 c)
         break;
 
     case ESCAPED_CHAR:
-        if (c == '\n' | c=='\r') {
+        if (c == '\n' || c=='\r') {
             if (parse_add_char(self, c) < 0)
                 return -1;
             self->state = AFTER_ESCAPED_CRNL;