PR#4328: use unittest.mock instead of mock
Merges #4328 https://pagure.io/koji/pull-request/4328 Fixes: #4327 https://pagure.io/koji/issue/4327 Import mock from unittest
This commit is contained in:
commit
00a01d2522
3 changed files with 12 additions and 3 deletions
|
|
@ -1,5 +1,8 @@
|
||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
import mock
|
try:
|
||||||
|
from unittest import mock
|
||||||
|
except ImportError:
|
||||||
|
import mock
|
||||||
import os
|
import os
|
||||||
import rpm
|
import rpm
|
||||||
import shutil
|
import shutil
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,10 @@ import tempfile
|
||||||
import time
|
import time
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
import mock
|
try:
|
||||||
|
from unittest import mock
|
||||||
|
except ImportError:
|
||||||
|
import mock
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
import koji
|
import koji
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,8 @@
|
||||||
import unittest
|
import unittest
|
||||||
import mock
|
try:
|
||||||
|
from unittest import mock
|
||||||
|
except ImportError:
|
||||||
|
import mock
|
||||||
|
|
||||||
import scmpolicy
|
import scmpolicy
|
||||||
import koji
|
import koji
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue