Merge branch 'master' into forward-port

[sliver-openvswitch.git] / python / ovs / db / error.py

diff --git a/python/ovs/db/error.py b/python/ovs/db/error.py
index 084db6e..d9217e4 100644 (file)
--- a/python/ovs/db/error.py
+++ b/python/ovs/db/error.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010 Nicira Networks
+# Copyright (c) 2009, 2010, 2011 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
 
 import ovs.json
 
+
 class Error(Exception):
     def __init__(self, msg, json=None, tag=None):
-        Exception.__init__(self)
         self.msg = msg
         self.json = json
         if tag is None:
@@ -27,8 +27,8 @@ class Error(Exception):
         else:
             self.tag = tag
 
-    def __str__(self):
+        # Compose message.
         syntax = ""
         if self.json is not None:
-                syntax = "syntax \"%s\": " % ovs.json.to_string(self.json)
-        return "%s%s: %s" % (syntax, self.tag, self.msg)
+                syntax = 'syntax "%s": ' % ovs.json.to_string(self.json)
+        Exception.__init__(self, "%s%s: %s" % (syntax, self.tag, self.msg))