From 8fc5005dfe3eb66a46470ad8a8c7b95fc4d6bdca Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 6 Aug 2009 21:11:27 +0000
Subject: merge 0.6 series to trunk.

---
 lib/sqlalchemy/sql/operators.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'lib/sqlalchemy/sql/operators.py')

diff --git a/lib/sqlalchemy/sql/operators.py b/lib/sqlalchemy/sql/operators.py
index 7c21e8233..879f0f3e5 100644
--- a/lib/sqlalchemy/sql/operators.py
+++ b/lib/sqlalchemy/sql/operators.py
@@ -4,8 +4,13 @@
 """Defines operators used in SQL expressions."""
 
 from operator import (
-    and_, or_, inv, add, mul, sub, div, mod, truediv, lt, le, ne, gt, ge, eq
+    and_, or_, inv, add, mul, sub, mod, truediv, lt, le, ne, gt, ge, eq
     )
+    
+# Py2K
+from operator import (div,)
+# end Py2K
+
 from sqlalchemy.util import symbol
 
 
@@ -88,7 +93,10 @@ _largest = symbol('_largest')
 _PRECEDENCE = {
     from_: 15,
     mul: 7,
+    truediv: 7,
+    # Py2K
     div: 7,
+    # end Py2K
     mod: 7,
     add: 6,
     sub: 6,
-- 
cgit v1.2.1