summaryrefslogtreecommitdiffstats
path: root/utils/test/testapi/opnfv_testapi/tornado_swagger/swagger.py
diff options
context:
space:
mode:
authorSerenaFeng <feng.xiaowei@zte.com.cn>2017-05-10 11:39:42 +0800
committerSerenaFeng <feng.xiaowei@zte.com.cn>2017-05-10 11:39:42 +0800
commit2458c2bfaae2cdd37dbc4d8fb88e45645c2baf57 (patch)
treee63638f8d1e11959a2226a779dd11944582209fa /utils/test/testapi/opnfv_testapi/tornado_swagger/swagger.py
parent942e19eca5228602a2ee73b0d4ef12d2e04ee6f1 (diff)
correct the import impl of TestAPI
Change-Id: Ia721ff61e02b1819c32d228f5f8910364c139c8a Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
Diffstat (limited to 'utils/test/testapi/opnfv_testapi/tornado_swagger/swagger.py')
-rw-r--r--utils/test/testapi/opnfv_testapi/tornado_swagger/swagger.py23
1 files changed, 12 insertions, 11 deletions
diff --git a/utils/test/testapi/opnfv_testapi/tornado_swagger/swagger.py b/utils/test/testapi/opnfv_testapi/tornado_swagger/swagger.py
index 3d21edefb..a0f6ae70c 100644
--- a/utils/test/testapi/opnfv_testapi/tornado_swagger/swagger.py
+++ b/utils/test/testapi/opnfv_testapi/tornado_swagger/swagger.py
@@ -6,15 +6,15 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-import inspect
-from functools import wraps
from HTMLParser import HTMLParser
+from functools import wraps
+import inspect
import epydoc.markup
import tornado.web
-from settings import default_settings, models
-from handlers import swagger_handlers
+from opnfv_testapi.tornado_swagger import handlers
+from opnfv_testapi.tornado_swagger import settings
class EpytextParser(HTMLParser):
@@ -204,7 +204,7 @@ class model(DocParser):
if '__init__' in dir(cls):
self._parse_args(cls.__init__)
self.parse_docstring(inspect.getdoc(cls))
- models.append(self)
+ settings.models.append(self)
def _parse_args(self, func):
argspec = inspect.getargspec(func)
@@ -276,15 +276,16 @@ class operation(DocParser):
def docs(**opts):
- default_settings.update(opts)
+ settings.default_settings.update(opts)
class Application(tornado.web.Application):
- def __init__(self, handlers=None,
+ def __init__(self, app_handlers=None,
default_host="",
transforms=None,
**settings):
- super(Application, self).__init__(swagger_handlers() + handlers,
- default_host,
- transforms,
- **settings)
+ super(Application, self).__init__(
+ handlers.swagger_handlers() + app_handlers,
+ default_host,
+ transforms,
+ **settings)