remove explicit mock
The explicit mock package is not required if you can use unittest.mock from python >= 3.3 Change-Id: I1e3a764b38be66b994d790768bc5eb9be4237444
This commit is contained in:
parent
c718425299
commit
397b6fcdf9
|
@ -48,7 +48,10 @@ import tempfile
|
||||||
import textwrap
|
import textwrap
|
||||||
|
|
||||||
import fixtures
|
import fixtures
|
||||||
import mock
|
try:
|
||||||
|
from unittest import mock
|
||||||
|
except ImportError:
|
||||||
|
import mock
|
||||||
import pkg_resources
|
import pkg_resources
|
||||||
import six
|
import six
|
||||||
import testscenarios
|
import testscenarios
|
||||||
|
|
|
@ -10,7 +10,10 @@
|
||||||
# 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 mock
|
try:
|
||||||
|
from unittest import mock
|
||||||
|
except ImportError:
|
||||||
|
import mock
|
||||||
|
|
||||||
from pbr import pbr_json
|
from pbr import pbr_json
|
||||||
from pbr.tests import base
|
from pbr.tests import base
|
||||||
|
|
|
@ -6,7 +6,6 @@ wheel>=0.32.0 # MIT
|
||||||
fixtures>=3.0.0 # Apache-2.0/BSD
|
fixtures>=3.0.0 # Apache-2.0/BSD
|
||||||
hacking>=1.1.0,<4.0.0;python_version>='3.6' # Apache-2.0
|
hacking>=1.1.0,<4.0.0;python_version>='3.6' # Apache-2.0
|
||||||
mock>=2.0.0,<4.0.0;python_version=='2.7' # BSD
|
mock>=2.0.0,<4.0.0;python_version=='2.7' # BSD
|
||||||
mock>=2.0.0;python_version>='3.6' # BSD
|
|
||||||
six>=1.12.0 # MIT
|
six>=1.12.0 # MIT
|
||||||
stestr>=2.1.0,<3.0;python_version=='2.7' # Apache-2.0
|
stestr>=2.1.0,<3.0;python_version=='2.7' # Apache-2.0
|
||||||
stestr>=2.1.0;python_version>='3.0' # Apache-2.0
|
stestr>=2.1.0;python_version>='3.0' # Apache-2.0
|
||||||
|
|
Loading…
Reference in New Issue