Merge remote-tracking branch 'origin/asyncio' into asyncio

This commit is contained in:
grossmj
2015-02-12 19:15:47 -07:00
44 changed files with 1419 additions and 5194 deletions

View File

@ -24,18 +24,4 @@ from ..vm_error import VMError
class DynamipsError(VMError):
def __init__(self, message, original_exception=None):
Exception.__init__(self, message)
if isinstance(message, Exception):
message = str(message)
self._message = message
self._original_exception = original_exception
def __repr__(self):
return self._message
def __str__(self):
return self._message
pass