Merge pull request #11 from cannatag/dev

Dev

README.md

@@ -78,7 +78,9 @@ For information and suggestions you can contact me at cannatag@gmail.com or you
 
 CHANGELOG
 ---------
-
+* 0.9.7.3 2015.01.25
+    - Modify operation type can also be passed as integer
+
 * 0.9.7.2 2015.01.11
     - Fixed a bug when resolving IP address with getaddrinfo(). On OSX returned an UDP connection.
 

README.rst

@@ -80,6 +80,9 @@ Contact me
 
 For information and suggestions you can contact me at cannatag@gmail.com or you can also a support ticket on https://github.com/cannatag/ldap3/issues/new
 
+* 0.9.7.3 2015.01.25
+    - Modify operation type can also be passed as integer
+
 * 0.9.7.2 2015.01.16
     - Fixed a bug when resolving IP address with getaddrinfo(). On OSX returned an UDP connection.
 

docs/manual/source/changelog.rst

@@ -1,5 +1,11 @@
 CHANGELOG
 =========
+* 0.9.7.3 2015.01.25
+    - Modify operation type can also be passed as integer
+
+* 0.9.7.2 2015.01.16
+    - Fixed a bug when resolving IP address with getaddrinfo(). On OSX returned an UDP connection.
+
 * 0.9.7.1 2015.01.05
     - Moved to Github
     - Moved to Travis-CI for continuous integration

docs/manual/source/quicktour.rst

@@ -70,9 +70,9 @@ To move from synchronous to asynchronous connection you have just to change the
 
 That's all you have to do to have an asynchronous threaded LDAP client connection.
 
-To get operational attributes (createStamp, modifiedStamp, ...) for response objects add 'get_operational_attribute = True' in the search request::
+To get operational attributes (createStamp, modifiedStamp, ...) for response objects add 'get_operational_attributes = True' in the search request::
 
-    c.search('o=test','(objectClass=*)', SUBTREE, attributes = ['sn', 'objectClass'], get_operational_attribute = True)
+    c.search('o=test','(objectClass=*)', SUBTREE, attributes = ['sn', 'objectClass'], get_operational_attributes = True)
 
 
 Connection context manager
@@ -105,7 +105,9 @@ Binding
 -------
 
 You can bind (authenticate) to the server with any of the authentication method defined in the LDAP v3 protocol: Anonymous, Simple and SASL.
+
 You can perform an automatic bind with the auto_bind=True parameter of the connection object or performing a bind() operation that returns a boolean to indicate if bind was succcesful.
+
 You can read the result of the bind operation in the 'result' attribute of the connection object. If auto_bind is not succesful the library will raise an LDAPBindError exception.
 
 Searching

ldap3/core/connection.py

@@ -596,7 +596,7 @@ def modify(self,
                 if len(changes[change]) != 2:
                     self.last_error = 'malformed change'
                     raise LDAPChangesError(self.last_error)
-                elif changes[change][0] not in [MODIFY_ADD, MODIFY_DELETE, MODIFY_REPLACE, MODIFY_INCREMENT]:
+                elif changes[change][0] not in [MODIFY_ADD, MODIFY_DELETE, MODIFY_REPLACE, MODIFY_INCREMENT, 0, 1, 2, 3]:
                     self.last_error = 'unknown change type'
                     raise LDAPChangesError(self.last_error)
 

ldap3/operation/modify.py

@@ -22,7 +22,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with ldap3 in the COPYING and COPYING.LESSER files.
 # If not, see <http://www.gnu.org/licenses/>.
-from .. import SEQUENCE_TYPES
+
+from .. import SEQUENCE_TYPES, MODIFY_ADD, MODIFY_DELETE, MODIFY_REPLACE, MODIFY_INCREMENT
 from ..protocol.rfc4511 import ModifyRequest, LDAPDN, Changes, Change, Operation, PartialAttribute, AttributeDescription, Vals, ResultCode
 from ..operation.bind import referrals_to_list
 from ..protocol.convert import changes_to_list, validate_attribute_value
@@ -38,10 +39,15 @@
 #            ...  },
 #    modification    PartialAttribute } }
 
-change_table = dict(MODIFY_ADD=0,
-                    MODIFY_DELETE=1,
-                    MODIFY_REPLACE=2,
-                    MODIFY_INCREMENT=3)
+change_table = {MODIFY_ADD: 0,  # accepts direct values too
+                MODIFY_DELETE: 1,
+                MODIFY_REPLACE: 2,
+                MODIFY_INCREMENT: 3,
+                0: 0,
+                1: 1,
+                2: 2,
+                3: 3}
+
 
 
 def modify_operation(dn,

ldap3/protocol/rfc4512.py

@@ -76,6 +76,9 @@ def attribute_usage_to_constant(value):
 
 def quoted_string_to_list(quoted_string):
     string = quoted_string.strip()
+    if not string:
+        return list()
+
     if string[0] == '(' and string[-1] == ')':
         string = string[1:-1]
     elements = string.split("'")