From 16d09b37da7e7560a6b98136e936277bd914697a Mon Sep 17 00:00:00 2001 From: Christophe de Vienne Date: Mon, 15 Oct 2012 14:30:46 +0200 Subject: [PATCH] Move the imports to avoid cross-import problems (all this needs some rework) --- wsme/protocols/commons.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wsme/protocols/commons.py b/wsme/protocols/commons.py index fe9e691..c0da24f 100644 --- a/wsme/protocols/commons.py +++ b/wsme/protocols/commons.py @@ -114,6 +114,9 @@ def dict_from_params(datatype, params, path, hit_paths): def get_args(funcdef, args, kwargs, body, mimetype): + from wsme.protocols import restjson + from wsme.protocols import restxml + newargs = [] for argdef, arg in zip(funcdef.arguments[:len(args)], args): newargs.append(from_param(argdef.datatype, arg)) @@ -140,6 +143,3 @@ def get_args(funcdef, args, kwargs, body, mimetype): else: newargs[-1] = bodydata return newargs, newkwargs - -from . import restjson -from . import restxml