summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2010-07-18 13:25:43 -0500
committerVishvananda Ishaya <vishvananda@gmail.com>2010-07-18 13:25:43 -0500
commit5d647826d6345bfdd87bad10995319679f39679f (patch)
tree979b3fa11717c38b868b08239cbf3a50b4e27f49 /nova/exception.py
parent0b396e1315a76112ab978a677e96d7b3a371faa9 (diff)
parentb09e69c5579526fcc1a08c7e3c3a3c880fa09297 (diff)
merged in trunk and fixed import merge errors
Diffstat (limited to 'nova/exception.py')
-rw-r--r--nova/exception.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/exception.py b/nova/exception.py
index 09d894e4b..bda002d1e 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -22,8 +22,8 @@ Nova-type exceptions. SHOULD include dedicated exception logging.
"""
import logging
-import traceback
import sys
+import traceback
class Error(Exception):
def __init__(self, message=None):