# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1275694756 -7200
# Node ID 62c4e5c5a2540bdb5d0379d092f6acdd81a1404e
# Parent  5b044511726846db3506470e9469d65a49ae515c
Fixed function name to avoid conflict with keyword.

diff -r 5b0445117268 -r 62c4e5c5a254 lib/operator.py
--- a/lib/operator.py	Sat Jun 05 00:49:22 2010 +0200
+++ b/lib/operator.py	Sat Jun 05 01:39:16 2010 +0200
@@ -85,7 +85,7 @@
 def mul(a, b):
     return binary_op(a, b, lambda a: a.__mul__, lambda b: b.__rmul__)
 
-def or(a, b):
+def or_(a, b):
     return binary_op(a, b, lambda a: a.__or__, lambda b: b.__ror__)
 
 def pow(a, b):