From 6390b59ba7a5bb77fe33b5d39848f210f8b73105 Mon Sep 17 00:00:00 2001 From: stroeder Date: Wed, 12 Jul 2017 17:30:12 +0000 Subject: [PATCH] started 2.4.41: Added support for increment: lines in LDIF changes records --- CHANGES | 10 +++++++++- Lib/dsml.py | 4 ++-- Lib/ldap/__init__.py | 4 ++-- Lib/ldapurl.py | 4 ++-- Lib/ldif.py | 11 ++++++----- Lib/slapdtest.py | 4 ++-- 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/CHANGES b/CHANGES index 50204fd..9306264 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,11 @@ +---------------------------------------------------------------- +Released 2.4.40 2017-07-xx + +Changes since 2.4.40: + +Lib/ +* Added support for increment: lines in LDIF changes records + ---------------------------------------------------------------- Released 2.4.40 2017-06-27 @@ -1452,4 +1460,4 @@ Released 2.0.0pre02 2002-02-01 ---------------------------------------------------------------- Released 1.10alpha3 2000-09-19 -$Id: CHANGES,v 1.450 2017/06/27 18:38:08 stroeder Exp $ +$Id: CHANGES,v 1.451 2017/07/12 17:30:12 stroeder Exp $ diff --git a/Lib/dsml.py b/Lib/dsml.py index 0449628..4d78bb8 100644 --- a/Lib/dsml.py +++ b/Lib/dsml.py @@ -4,13 +4,13 @@ See http://www.python-ldap.org/ for details. -$Id: dsml.py,v 1.57 2017/06/23 07:16:26 stroeder Exp $ +$Id: dsml.py,v 1.58 2017/07/12 17:30:12 stroeder Exp $ Python compability note: Tested with Python 2.0+. """ -__version__ = '2.4.40' +__version__ = '2.4.41' import string,base64 diff --git a/Lib/ldap/__init__.py b/Lib/ldap/__init__.py index 45d4c27..6be3ce6 100644 --- a/Lib/ldap/__init__.py +++ b/Lib/ldap/__init__.py @@ -3,12 +3,12 @@ See http://www.python-ldap.org/ for details. -$Id: __init__.py,v 1.118 2017/06/23 07:16:26 stroeder Exp $ +$Id: __init__.py,v 1.119 2017/07/12 17:30:12 stroeder Exp $ """ # This is also the overall release version number -__version__ = '2.4.40' +__version__ = '2.4.41' import sys diff --git a/Lib/ldapurl.py b/Lib/ldapurl.py index 65d7dc9..ba0ea8a 100644 --- a/Lib/ldapurl.py +++ b/Lib/ldapurl.py @@ -3,7 +3,7 @@ See http://www.python-ldap.org/ for details. -\$Id: ldapurl.py,v 1.93 2017/06/23 07:16:26 stroeder Exp $ +\$Id: ldapurl.py,v 1.94 2017/07/12 17:30:12 stroeder Exp $ Python compability note: This module only works with Python 2.0+ since @@ -11,7 +11,7 @@ 2. list comprehensions are used. """ -__version__ = '2.4.40' +__version__ = '2.4.41' __all__ = [ # constants diff --git a/Lib/ldif.py b/Lib/ldif.py index 6dce79a..bfd0dc5 100644 --- a/Lib/ldif.py +++ b/Lib/ldif.py @@ -3,13 +3,13 @@ See http://www.python-ldap.org/ for details. -$Id: ldif.py,v 1.113 2017/06/23 07:16:26 stroeder Exp $ +$Id: ldif.py,v 1.114 2017/07/12 17:30:12 stroeder Exp $ Python compability note: Tested with Python 2.0+, but should work with Python 1.5.2+. """ -__version__ = '2.4.40' +__version__ = '2.4.41' __all__ = [ # constants @@ -40,13 +40,14 @@ ldif_pattern = '^((dn(:|::) %(dn_pattern)s)|(%(attrtype_pattern)s(:|::) .*)$)+' % vars() MOD_OP_INTEGER = { - 'add' :0, # ldap.MOD_REPLACE - 'delete' :1, # ldap.MOD_DELETE + 'add':0, # ldap.MOD_ADD + 'delete':1, # ldap.MOD_DELETE 'replace':2, # ldap.MOD_REPLACE + 'increment':3, # ldap.MOD_INCREMENT } MOD_OP_STR = { - 0:'add',1:'delete',2:'replace' + 0:'add',1:'delete',2:'replace',3:'increment' } CHANGE_TYPES = ['add','delete','modify','modrdn'] diff --git a/Lib/slapdtest.py b/Lib/slapdtest.py index c1d57c8..26432cc 100644 --- a/Lib/slapdtest.py +++ b/Lib/slapdtest.py @@ -4,13 +4,13 @@ See http://www.python-ldap.org/ for details. -$Id: slapdtest.py,v 1.13 2017/06/23 07:16:26 stroeder Exp $ +$Id: slapdtest.py,v 1.14 2017/07/12 17:30:12 stroeder Exp $ Python compability note: This module only works with Python 2.7.x since """ -__version__ = '2.4.40' +__version__ = '2.4.41' import os import socket