openstack/os-ken
Code Issues Proposed changes

python3: Misc. python3 fix

Browse Source 
These are several kinds of python3 compatibility idioms.

Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
IWAMOTO Toshihiro 2015-06-30 17:01:58 +09:00 committed by FUJITA Tomonori
parent 8fe50be72f
commit ffb409135e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ryu/tests/switch/tester.py
View File

@ -1322,7 +1322,7 @@ class TestFile(stringify.StringifyMixin):
self._normalize_test_json(v)
def _get_tests(self, path):
with open(path, 'rb') as fhandle:
with open(path, 'r') as fhandle:
buf = fhandle.read()
try:
json_list = json.loads(buf)
@ -1334,7 +1334,7 @@ class TestFile(stringify.StringifyMixin):
self.tests.append(Test(test_json))
except (ValueError, TypeError) as e:
result = (TEST_FILE_ERROR %
{'file': path, 'detail': e.message})
{'file': path, 'detail': str(e)})
self.logger.warning(result)
@ -1349,7 +1349,7 @@ class Test(stringify.StringifyMixin):
def __test_pkt_from_json(test):
data = eval('/'.join(test))
data.serialize()
return str(data.data)
return six.binary_type(data.data)
def __normalize_match(ofproto, match):
match_json = match.to_jsondict()