From b3d15c1a391cc2193d54b3021317a14451be5c8c Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Thu, 5 Jan 2017 19:12:18 +0100
Subject: [PATCH 3/4] move wcs.formdata.flatten_dict() into qommon.misc
 (#14510)

---
 wcs/formdata.py    | 9 +--------
 wcs/qommon/misc.py | 8 ++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/wcs/formdata.py b/wcs/formdata.py
index 14a8910..2602793 100644
--- a/wcs/formdata.py
+++ b/wcs/formdata.py
@@ -30,6 +30,7 @@ from qommon import _
 from qommon.storage import StorableObject, Intersects, Contains
 import qommon.misc
 from qommon import ezt
+from qommon.misc import flatten_dict
 from qommon.substitution import Substitutions
 
 from roles import Role
@@ -92,14 +93,6 @@ def get_dict_with_varnames(fields, data, formdata=None, varnames_only=False):
                             new_data['var_%s_%s_%s' % (field.varname, i, k)] = v
     return new_data
 
-def flatten_dict(d):
-    for k, v in d.items():
-        if type(v) is dict:
-            flatten_dict(v)
-            for k2, v2 in v.items():
-                d['%s_%s' % (k, k2)] = v2
-            del d[k]
-
 
 def get_json_dict(fields, data, include_files=True, anonymise=False):
     new_data = {}
diff --git a/wcs/qommon/misc.py b/wcs/qommon/misc.py
index 687fb83..99cdc37 100644
--- a/wcs/qommon/misc.py
+++ b/wcs/qommon/misc.py
@@ -550,3 +550,11 @@ def compute(expr, do_ezt=True, raises=False, context=None):
         if raises:
             raise
         return expr
+
+def flatten_dict(d):
+    for k, v in d.items():
+        if type(v) is dict:
+            flatten_dict(v)
+            for k2, v2 in v.items():
+                d['%s_%s' % (k, k2)] = v2
+            del d[k]
-- 
2.1.4