Merge "Remove six leftovers"
This commit is contained in:
commit
74318321aa
|
@ -19,6 +19,7 @@ classifier =
|
||||||
Programming Language :: Python :: 3
|
Programming Language :: Python :: 3
|
||||||
Programming Language :: Python :: 3.6
|
Programming Language :: Python :: 3.6
|
||||||
Programming Language :: Python :: 3.7
|
Programming Language :: Python :: 3.7
|
||||||
|
Programming Language :: Python :: 3.8
|
||||||
|
|
||||||
[files]
|
[files]
|
||||||
packages =
|
packages =
|
||||||
|
|
|
@ -13,8 +13,9 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
from six.moves import mock
|
|
||||||
|
|
||||||
from sushy_tools.emulator.resources.drives import StaticDriver
|
from sushy_tools.emulator.resources.drives import StaticDriver
|
||||||
|
|
||||||
|
|
|
@ -13,8 +13,9 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
from six.moves import mock
|
|
||||||
|
|
||||||
from sushy_tools.emulator.resources import managers
|
from sushy_tools.emulator.resources import managers
|
||||||
from sushy_tools import error
|
from sushy_tools import error
|
||||||
|
|
|
@ -13,8 +13,9 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
from oslotest import base
|
from oslotest import base
|
||||||
from six.moves import mock
|
|
||||||
|
|
||||||
from sushy_tools.emulator.resources.storage import StaticDriver
|
from sushy_tools.emulator.resources.storage import StaticDriver
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue