Merge pull request #3456 from jepler/qstr-and-or-demagic

makeqstrdefs: don't make _and_, _or_ poisoned substrings for QSTRs

Author: tannewt

py/makeqstrdefs.py

@@ -57,6 +57,10 @@
 name2codepoint['pipe'] = ord('|')
 name2codepoint['tilde'] = ord('~')
 
+# These are just vexing!
+del name2codepoint['and']
+del name2codepoint['or']
+
 def write_out(fname, output):
     if output:
         for m, r in [("/", "__"), ("\\", "__"), (":", "@"), ("..", "@@")]: