X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=ldapdb%2F__init__.py;h=fc9e0ff8c2bcdaf8026166c92c85713816d8ffb2;hp=d1dcc47d05012a4260431dcabc6b2b3ffe306068;hb=62de279ee18d0054b8eef779844365723250b96b;hpb=6035af62fccb4c3f623fd5be0072281f953790f5

diff --git a/ldapdb/__init__.py b/ldapdb/__init__.py
index d1dcc47..fc9e0ff 100644
--- a/ldapdb/__init__.py
+++ b/ldapdb/__init__.py
@@ -1,21 +1,35 @@
 # -*- coding: utf-8 -*-
 # 
 # django-ldapdb
-# Copyright (C) 2009-2010 Bolloré telecom
+# Copyright (c) 2009-2010, Bolloré telecom
+# All rights reserved.
+# 
 # See AUTHORS file for a full list of contributors.
 # 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+# 
+#     1. Redistributions of source code must retain the above copyright notice, 
+#        this list of conditions and the following disclaimer.
+#     
+#     2. Redistributions in binary form must reproduce the above copyright 
+#        notice, this list of conditions and the following disclaimer in the
+#        documentation and/or other materials provided with the distribution.
 # 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+#     3. Neither the name of Bolloré telecom nor the names of its contributors
+#        may be used to endorse or promote products derived from this software
+#        without specific prior written permission.
 # 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
 import ldap
@@ -23,19 +37,8 @@ import ldap
 from django.conf import settings
 from django.db.backends import BaseDatabaseFeatures, BaseDatabaseOperations
 
-def convert(field, value, func):
-    # FIXME : we should not reference the attribute name!
-    if not value or field == 'jpegPhoto':
-        return value
-    elif isinstance(value, int):
-        return str(value)
-    elif isinstance(value, list):
-        return [ func(x) for x in value ]
-    else:
-        return func(value)
-
 def escape_ldap_filter(value):
-    value = str(value)
+    value = unicode(value)
     return value.replace('\\', '\\5c') \
                 .replace('*', '\\2a') \
                 .replace('(', '\\28') \
@@ -47,7 +50,8 @@ class DatabaseCursor(object):
         self.connection = ldap_connection
 
 class DatabaseFeatures(BaseDatabaseFeatures):
-    pass
+    def __init__(self, connection):
+        self.connection = connection
 
 class DatabaseOperations(BaseDatabaseOperations):
     def quote_name(self, name):
@@ -57,7 +61,7 @@ class LdapConnection(object):
     def __init__(self):
         self.connection = None
         self.charset = "utf-8"
-        self.features = DatabaseFeatures()
+        self.features = DatabaseFeatures(self)
         self.ops = DatabaseOperations()
 
     def _cursor(self):
@@ -69,26 +73,16 @@ class LdapConnection(object):
         return DatabaseCursor(self.connection)
 
     def add_s(self, dn, modlist):
-        mods = []
-        for field, value in modlist:
-            converted = convert(field, value, lambda x: x.encode(self.charset))
-            if isinstance(converted, list):
-                mods.append((field, converted))
-            else:
-                mods.append((field, [converted]))
         cursor = self._cursor()
-        return cursor.connection.add_s(dn.encode(self.charset), mods)
+        return cursor.connection.add_s(dn.encode(self.charset), modlist)
 
     def delete_s(self, dn):
         cursor = self._cursor()
         return cursor.connection.delete_s(dn.encode(self.charset))
 
     def modify_s(self, dn, modlist):
-        mods = []
-        for op, field, value in modlist:
-            mods.append((op, field, convert(field, value, lambda x: x.encode(self.charset))))
         cursor = self._cursor()
-        return cursor.connection.modify_s(dn.encode(self.charset), mods)
+        return cursor.connection.modify_s(dn.encode(self.charset), modlist)
 
     def rename_s(self, dn, newrdn):
         cursor = self._cursor()
@@ -99,8 +93,6 @@ class LdapConnection(object):
         results = cursor.connection.search_s(base, scope, filterstr.encode(self.charset), attrlist)
         output = []
         for dn, attrs in results:
-            for field in attrs:
-                attrs[field] = convert(field, attrs[field], lambda x: x.decode(self.charset))
             output.append((dn.decode(self.charset), attrs))
         return output