From ba46652bf79d3b29f113e9bd8fc8268cc77f2f62 Mon Sep 17 00:00:00 2001
From: stroeder <stroeder>
Date: Wed, 8 Feb 2017 09:44:18 +0000
Subject: [PATCH] release 2.4.30 with compability fix for pyasn1 0.2.x

---
 CHANGES                    | 11 ++++++++++-
 Lib/dsml.py                |  4 ++--
 Lib/ldap/__init__.py       |  4 ++--
 Lib/ldap/controls/deref.py |  9 ++++-----
 Lib/ldapurl.py             |  4 ++--
 Lib/ldif.py                |  4 ++--
 6 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/CHANGES b/CHANGES
index 29baf03..5bdf7d1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+----------------------------------------------------------------
+Released 2.4.30 2017-02-08
+
+Changes since 2.4.29:
+
+Lib/
+* compability fix in ldap.controls.deref to be compatible to
+  recent pyasn1 0.2.x (thanks to Ilya Etingof)
+
 ----------------------------------------------------------------
 Released 2.4.29 2017-01-25
 
@@ -1307,4 +1316,4 @@ Released 2.0.0pre02 2002-02-01
 ----------------------------------------------------------------
 Released 1.10alpha3 2000-09-19
 
-$Id: CHANGES,v 1.402 2017/01/25 19:43:39 stroeder Exp $
+$Id: CHANGES,v 1.403 2017/02/08 09:44:18 stroeder Exp $
diff --git a/Lib/dsml.py b/Lib/dsml.py
index 3273bff..c9ac2ca 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.46 2017/01/06 15:07:57 stroeder Exp $
+$Id: dsml.py,v 1.47 2017/02/08 09:44:18 stroeder Exp $
 
 Python compability note:
 Tested with Python 2.0+.
 """
 
-__version__ = '2.4.29'
+__version__ = '2.4.30'
 
 import string,base64
 
diff --git a/Lib/ldap/__init__.py b/Lib/ldap/__init__.py
index 03ec9fb..a0f76da 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.107 2017/01/06 15:07:57 stroeder Exp $
+$Id: __init__.py,v 1.108 2017/02/08 09:44:18 stroeder Exp $
 """
 
 # This is also the overall release version number
 
-__version__ = '2.4.29'
+__version__ = '2.4.30'
 
 import sys
 
diff --git a/Lib/ldap/controls/deref.py b/Lib/ldap/controls/deref.py
index 02c68b7..504647e 100644
--- a/Lib/ldap/controls/deref.py
+++ b/Lib/ldap/controls/deref.py
@@ -5,7 +5,7 @@
 
 See http://www.python-ldap.org/ for project details.
 
-$Id: deref.py,v 1.2 2015/09/19 13:41:01 stroeder Exp $
+$Id: deref.py,v 1.3 2017/02/08 09:44:18 stroeder Exp $
 """
 
 __all__ = [
@@ -108,15 +108,14 @@ def decodeControlValue(self,encodedControlValue):
     decodedValue,_ = decoder.decode(encodedControlValue,asn1Spec=DerefResultControlValue())
     self.derefRes = {}
     for deref_res in decodedValue:
-      deref_attr,deref_val,deref_vals = deref_res
+      deref_attr,deref_val,deref_vals = deref_res[0],deref_res[1],deref_res[2]
       partial_attrs_dict = dict([
-        (str(t),map(str,v))
-        for t,v in deref_vals or []
+        (str(tv[0]),map(str,tv[1]))
+        for tv in deref_vals or []
       ])
       try:
         self.derefRes[str(deref_attr)].append((str(deref_val),partial_attrs_dict))
       except KeyError:
         self.derefRes[str(deref_attr)] = [(str(deref_val),partial_attrs_dict)]
 
-
 KNOWN_RESPONSE_CONTROLS[DereferenceControl.controlType] = DereferenceControl
diff --git a/Lib/ldapurl.py b/Lib/ldapurl.py
index df70510..d5ed4cf 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.82 2017/01/06 15:07:57 stroeder Exp $
+\$Id: ldapurl.py,v 1.83 2017/02/08 09:44:18 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.29'
+__version__ = '2.4.30'
 
 __all__ = [
   # constants
diff --git a/Lib/ldif.py b/Lib/ldif.py
index 8ef39bd..621ad79 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.102 2017/01/06 15:07:57 stroeder Exp $
+$Id: ldif.py,v 1.103 2017/02/08 09:44:18 stroeder Exp $
 
 Python compability note:
 Tested with Python 2.0+, but should work with Python 1.5.2+.
 """
 
-__version__ = '2.4.29'
+__version__ = '2.4.30'
 
 __all__ = [
   # constants