From 14e02069ffc765374e4567bcfc36e4670c340344 Mon Sep 17 00:00:00 2001 From: Satoshi Kobayashi Date: Tue, 14 Apr 2015 13:18:24 +0900 Subject: [PATCH] 'reload' has been renamed to 'imp.reload' in Python 3 Signed-off-by: Satoshi Kobayashi Signed-off-by: FUJITA Tomonori --- ryu/tests/unit/cmd/test_manager.py | 7 +++++++ ryu/tests/unit/ofproto/test_ofproto.py | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/ryu/tests/unit/cmd/test_manager.py b/ryu/tests/unit/cmd/test_manager.py index 84c67c2b..0f8fb624 100644 --- a/ryu/tests/unit/cmd/test_manager.py +++ b/ryu/tests/unit/cmd/test_manager.py @@ -19,6 +19,13 @@ import unittest import mock from nose.tools import eq_, raises +try: + # Python 3 + from imp import reload +except ImportError: + # Python 2 + pass + from ryu.cmd.manager import main diff --git a/ryu/tests/unit/ofproto/test_ofproto.py b/ryu/tests/unit/ofproto/test_ofproto.py index 272747df..47f1e544 100644 --- a/ryu/tests/unit/ofproto/test_ofproto.py +++ b/ryu/tests/unit/ofproto/test_ofproto.py @@ -16,6 +16,13 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 +try: + # Python 3 + from imp import reload +except ImportError: + # Python 2 + pass + import unittest import logging from nose.tools import eq_