Fix cherry-pick errors.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
parent
7ff8c2b224
commit
2b75741e5a
4 changed files with 10 additions and 57 deletions
|
|
@ -1,5 +1,7 @@
|
|||
import sys
|
||||
|
||||
import mock # noqa
|
||||
|
||||
if sys.version_info >= (2, 7):
|
||||
import unittest # NOQA
|
||||
else:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue