django 1.0 is no longer supported

[matthijs/upstream/django-ldapdb.git] / ldapdb / models / query.py

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index 877ea9e40ee74c0b323361e39ca2ea893ba79f4f..ae4b73c7b559a3eac87e4953935b271c4a46bba1 100644 (file)
--- a/ldapdb/models/query.py
+++ b/ldapdb/models/query.py
@@ -53,6 +53,8 @@ class Constraint(BaseConstraint):
             params = ["*%s" % escape_ldap_filter(value)]
         elif lookup_type == 'startswith':
             params = ["%s*" % escape_ldap_filter(value)]
+        elif lookup_type == 'contains':
+            params = ["*%s*" % escape_ldap_filter(value)]
         elif lookup_type == 'exact':
             params = [escape_ldap_filter(value)]
         elif lookup_type == 'in':
@@ -88,12 +90,7 @@ class WhereNode(BaseWhereNode):
             if isinstance(item, WhereNode):
                 bits.append(item.as_sql())
                 continue
-            if len(item) == 4:
-                # django 1.1
-                (table, column, type), x, y, values = item
-            else:
-                # django 1.0
-                table, column, type, x, y, values = item
+            (table, column, type), x, y, values = item
             equal_bits = [ "(%s=%s)" % (column, value) for value in values ]
             if len(equal_bits) == 1:
                 clause = equal_bits[0]