mirror of
https://github.com/openvswitch/ovs
synced 2025-10-23 14:57:06 +00:00
0f9fc40325
All of the negative Python OVSDB tests were failing on Python 2.6 because "%s\n" % e yielded the empty string on that version of Python. In turn, that was because ovs.db.error.Error.__unicode__ was being called instead of ovs.db.error.Error.__str__. I'm puzzled why that was happening, but this commit fixes it and also seems like a small code cleanup. Peter Balland helped me gain some insight on this problem. CC: Peter Balland <peter@nicira.com> CC: Reid Price <reid@nicira.com>
34 lines
1.1 KiB
Python
34 lines
1.1 KiB
Python
# Copyright (c) 2009, 2010 Nicira Networks
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at:
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import ovs.json
|
|
|
|
class Error(Exception):
|
|
def __init__(self, msg, json=None, tag=None):
|
|
self.msg = msg
|
|
self.json = json
|
|
if tag is None:
|
|
if json is None:
|
|
self.tag = "ovsdb error"
|
|
else:
|
|
self.tag = "syntax error"
|
|
else:
|
|
self.tag = tag
|
|
|
|
# Compose message.
|
|
syntax = ""
|
|
if self.json is not None:
|
|
syntax = "syntax \"%s\": " % ovs.json.to_string(self.json)
|
|
Exception.__init__(self, "%s%s: %s" % (syntax, self.tag, self.msg))
|