dev-python/mockldap: Version Bump

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

2 files changed, 21 insertions, 42 deletions

diff --git a/dev-python/mockldap/files/mockldap-0.1.4-modify_s-backport.patch b/dev-python/mockldap/files/mockldap-0.1.4-modify_s-backport.patch
deleted file mode 100644
index 033c8d094945..000000000000
--- a/dev-python/mockldap/files/mockldap-0.1.4-modify_s-backport.patch
+++ /dev/null
@@ -1,42 +0,0 @@
- src/mockldap/ldapobject.py |  2 +-
- src/mockldap/tests.py      | 14 --------------
- 2 files changed, 1 insertion(+), 15 deletions(-)
-
-diff --git a/src/mockldap/ldapobject.py b/src/mockldap/ldapobject.py
-index 1528b83..1899824 100644
---- a/src/mockldap/ldapobject.py
-+++ b/src/mockldap/ldapobject.py
-@@ -256,7 +256,7 @@ class LDAPObject(RecordableMethods):
-                         entry[key].append(subvalue)
-             elif op is ldap.MOD_DELETE:
-                 if not value:
--                    del entry[key]
-+                    entry[key] = []
-                 else:
-                     for subvalue in value:
-                         if subvalue in entry[key]:
-diff --git a/src/mockldap/tests.py b/src/mockldap/tests.py
-index 2b1276a..1837666 100644
---- a/src/mockldap/tests.py
-+++ b/src/mockldap/tests.py
-@@ -430,20 +430,6 @@ class TestLDAPObject(unittest.TestCase):
-         self.assertEqual(self.ldapobj.directory[manager[0]]['objectClass'],
-                          ['posixAccount'])
- 
--    def test_modify_s_delete_all_values_from_attribute(self):
--        mod_list = [(ldap.MOD_DELETE, 'objectClass', None)]
--
--        self.ldapobj.modify_s(manager[0], mod_list)
--
--        self.assertNotIn('objectClass',
--                         self.ldapobj.directory[manager[0]].keys())
--
--    def test_modify_s_invalid_dn(self):
--        mod_list = [(ldap.MOD_DELETE, 'objectClass', None)]
--
--        with self.assertRaises(ldap.INVALID_DN_SYNTAX):
--            self.ldapobj.modify_s('invalid', mod_list)
--
-     def test_rename_s_successful_code(self):
-         result = self.ldapobj.rename_s('cn=alice,ou=example,o=test', 'uid=alice1')
- 
diff --git a/dev-python/mockldap/files/mockldap-0.1.5-modify_s-backport.patch b/dev-python/mockldap/files/mockldap-0.1.5-modify_s-backport.patch
new file mode 100644
index 000000000000..c66c63890aec
--- /dev/null
+++ b/dev-python/mockldap/files/mockldap-0.1.5-modify_s-backport.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User Peter Sagerson <psagers.hg@ignorare.net>
+# Date 1392920906 28800
+# Node ID 6433fd7dc97473150114c06a90d189a62a39951f
+# Parent  f298b032a25ef6c2bcc6749d9bf096352a49f37d
+Fix tests to match the recent modify_s change.
+
+diff --git a/src/mockldap/tests.py b/src/mockldap/tests.py
+--- a/src/mockldap/tests.py
++++ b/src/mockldap/tests.py
+@@ -453,8 +453,8 @@
+ 
+         self.ldapobj.modify_s(manager[0], mod_list)
+ 
+-        self.assertNotIn('objectClass',
+-                         self.ldapobj.directory[manager[0]].keys())
++        self.assertEqual(self.ldapobj.directory[manager[0]]['objectClass'],
++                         [])
+ 
+     def test_modify_s_invalid_dn(self):
+         mod_list = [(ldap.MOD_DELETE, 'objectClass', None)]