Fix cherry-pick errors.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2015-09-10 19:00:44 -04:00
commit 2b75741e5a
4 changed files with 10 additions and 57 deletions

View file

@ -1,5 +1,7 @@
import sys
import mock # noqa
if sys.version_info >= (2, 7):
import unittest # NOQA
else: