Merge "Allow Iotronic-Api to run in python2.7"

This commit is contained in:
Zuul 2018-09-25 17:22:12 +00:00 committed by Gerrit Code Review
commit 683d52042c
1 changed files with 8 additions and 1 deletions

View File

@ -13,7 +13,14 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import _pickle as cpickle
try:
# allow iotronic api to run also with python3
import _pickle as cpickle
except Exception:
# allow iotronic api to run also with python2.7
import pickle as cpickle
from iotronic.common import exception from iotronic.common import exception
from iotronic.common import neutron from iotronic.common import neutron
from iotronic.common import states from iotronic.common import states