Fixes for Python 2.7 support
Change-Id: Ibb10ce91d2150815c7366e657e98a113b0bf766f
This commit is contained in:
@@ -26,6 +26,7 @@ import pecan
|
|||||||
import random
|
import random
|
||||||
import re
|
import re
|
||||||
import shutil
|
import shutil
|
||||||
|
import sys
|
||||||
import tempfile
|
import tempfile
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
@@ -34,7 +35,10 @@ from oslo_concurrency import processutils
|
|||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_utils import excutils
|
from oslo_utils import excutils
|
||||||
import paramiko
|
import paramiko
|
||||||
|
|
||||||
|
if sys.version_info.major == 3:
|
||||||
from past.builtins import basestring
|
from past.builtins import basestring
|
||||||
|
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from cloudpulse.common import exception
|
from cloudpulse.common import exception
|
||||||
|
@@ -16,6 +16,8 @@ from cloudpulse import objects
|
|||||||
import contextlib
|
import contextlib
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
from oslo_utils import excutils
|
from oslo_utils import excutils
|
||||||
|
import sys
|
||||||
|
if sys.version_info.major == 3:
|
||||||
from past.builtins import xrange
|
from past.builtins import xrange
|
||||||
import time
|
import time
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user