diff options
Diffstat (limited to 'libbe/command/serve_commands.py')
| -rw-r--r-- | libbe/command/serve_commands.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libbe/command/serve_commands.py b/libbe/command/serve_commands.py index d380a8d..dbdb76b 100644 --- a/libbe/command/serve_commands.py +++ b/libbe/command/serve_commands.py @@ -27,7 +27,7 @@ import logging import os.path import posixpath import re -import urllib +import urllib.request, urllib.parse, urllib.error import wsgiref.simple_server import libbe @@ -40,7 +40,7 @@ import libbe.version if libbe.TESTING: import copy import doctest - import StringIO + import io import sys import unittest import wsgiref.validate @@ -90,7 +90,7 @@ class ServerApp (libbe.util.wsgi.WSGI_AppObject, parameters = data.get('parameters', {}) try: Class = libbe.command.get_command_class(command_name=name) - except libbe.command.UnknownCommand, e: + except libbe.command.UnknownCommand as e: raise libbe.util.wsgi.HandlerError( libbe.util.http.HTTP_USER_ERROR, 'UnknownCommand {}'.format(e)) command = Class(ui=self.ui) @@ -197,12 +197,12 @@ if libbe.TESTING: 'parameters': params, }, context=0) self.getURL(self.app, '/run', method='POST', data=data) - self.failUnless(self.status.startswith('200 '), self.status) - self.failUnless( + self.assertTrue(self.status.startswith('200 '), self.status) + self.assertTrue( ('Content-Type', 'application/octet-stream' ) in self.response_headers, self.response_headers) - self.failUnless(self.exc_info == None, self.exc_info) + self.assertTrue(self.exc_info == None, self.exc_info) # TODO: integration tests on ServeCommands? unitsuite =unittest.TestLoader().loadTestsFromModule(sys.modules[__name__]) |