Re: [Freeipa-devel] [PATCH 0308] Server Upgrade: fix traceback caused by cidict

2015-09-03 Thread Martin Basti



On 09/03/2015 01:42 PM, Petr Viktorin wrote:

On 09/03/2015 01:01 PM, Martin Basti wrote:

https://fedorahosted.org/freeipa/ticket/5283

Patch attached.

ACK.


This was caused by commit 3bf91ea, specifically the rushed reaction to
Christian's comment:

Please use sorted(reference) instead of sorted(reference.keys()),
set(tree) instead of set(tree.keys()) and list(somedict) instead of
list(somedict.keys()), too. The keys() call is unnecessary and frowned upon.

Turns out python-ldap's cidict is not a propper Mapping, so the keys()
call *is* necessary.
Sorry for missing that.



Pushed to master: 0c5e41cc79f75e12094773cdf5a296dd06052763

--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code


Re: [Freeipa-devel] [PATCH 0308] Server Upgrade: fix traceback caused by cidict

2015-09-03 Thread Petr Viktorin
On 09/03/2015 01:01 PM, Martin Basti wrote:
> https://fedorahosted.org/freeipa/ticket/5283
> 
> Patch attached.

ACK.


This was caused by commit 3bf91ea, specifically the rushed reaction to
Christian's comment:
> Please use sorted(reference) instead of sorted(reference.keys()),
> set(tree) instead of set(tree.keys()) and list(somedict) instead of
> list(somedict.keys()), too. The keys() call is unnecessary and frowned upon.

Turns out python-ldap's cidict is not a propper Mapping, so the keys()
call *is* necessary.
Sorry for missing that.


-- 
Petr Viktorin

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code


[Freeipa-devel] [PATCH 0308] Server Upgrade: fix traceback caused by cidict

2015-09-03 Thread Martin Basti

https://fedorahosted.org/freeipa/ticket/5283

Patch attached.
From 6afdb8a8bfe5dba3dc117c8ed15e0d90e2d63ce2 Mon Sep 17 00:00:00 2001
From: Martin Basti 
Date: Thu, 3 Sep 2015 12:55:05 +0200
Subject: [PATCH] Server Upgrade: fix traceback caused by cidict

Traceback caused by recent py3 code migration.

https://fedorahosted.org/freeipa/ticket/5283
---
 ipaserver/install/schemaupdate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipaserver/install/schemaupdate.py b/ipaserver/install/schemaupdate.py
index 432c44d42b14b0699142f3e32316942cc50d86f3..b3d7ee899df8151f4bfd6664b7961dc8b7df730b 100644
--- a/ipaserver/install/schemaupdate.py
+++ b/ipaserver/install/schemaupdate.py
@@ -56,7 +56,7 @@ def _get_oid_dependency_order(schema, cls):
 # remove top_node from tree, it breaks ordering
 # we don't need this, tree from file is not consistent
 del tree[top_node]
-unordered_oids = set(tree)
+unordered_oids = set(tree.keys())
 
 # split into two groups, parents and child nodes, and iterate until
 # child nodes are not empty
-- 
2.4.3

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code