diff options
author | W. Trevor King <wking@tremily.us> | 2012-10-26 13:09:21 -0400 |
---|---|---|
committer | W. Trevor King <wking@tremily.us> | 2012-10-26 13:09:53 -0400 |
commit | 1f771c68eec0cb191bd7d82f0f08134850a88e62 (patch) | |
tree | 030182eb4af053bc44b8f06d1dc0de71e8370f26 /libbe/command/serve_commands.py | |
parent | b4d97db6f3fd6c3f4f19c4a475f064e305a163f6 (diff) | |
download | bugseverywhere-1f771c68eec0cb191bd7d82f0f08134850a88e62.tar.gz |
command: use mapfiles (JSON) instead of YAML for the command server
Diffstat (limited to 'libbe/command/serve_commands.py')
-rw-r--r-- | libbe/command/serve_commands.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libbe/command/serve_commands.py b/libbe/command/serve_commands.py index 4628bfb..442beea 100644 --- a/libbe/command/serve_commands.py +++ b/libbe/command/serve_commands.py @@ -30,11 +30,10 @@ import re import urllib import wsgiref.simple_server -import yaml - import libbe import libbe.command import libbe.command.base +import libbe.storage.util.mapfile import libbe.util.wsgi import libbe.version @@ -113,7 +112,7 @@ class ServerApp (libbe.util.wsgi.WSGI_AppObject, # handler utility functions def _parse_post(self, post): - return yaml.safe_load(post) + return libbe.storage.util.mapfile.parse(post) def check_login(self, environ): user = environ.get('be-auth.user', None) @@ -208,10 +207,10 @@ if libbe.TESTING: def test_run_list(self): list = libbe.command.list.List() params = list._parse_options_args() - data = yaml.safe_dump({ + data = libbe.storage.util.mapfile.generate({ 'command': 'list', 'parameters': params, - }) + }, context=0) self.getURL(self.app, '/run', method='POST', data=data) self.failUnless(self.status.startswith('200 '), self.status) self.failUnless( |