diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2017-04-29 04:07:58 +0200 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2017-04-29 04:07:58 +0200 |
commit | c71d2bec27a85aaf161e389f7b40bce5adc375eb (patch) | |
tree | d4749d881fabadf07466b7d612ecc75214a63207 | |
parent | a759a044123c88a856aedb1e1994e8944981ecdf (diff) | |
download | psutil-c71d2bec27a85aaf161e389f7b40bce5adc375eb.tar.gz |
try to fix py 2.6 failure on travis
-rw-r--r-- | psutil/tests/__init__.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py index 1c4817db..9ffbc68c 100644 --- a/psutil/tests/__init__.py +++ b/psutil/tests/__init__.py @@ -36,11 +36,6 @@ try: except ImportError: from urllib2 import urlopen -try: - from unittest import mock # py3 -except ImportError: - import mock # NOQA - requires "pip install mock" - import psutil from psutil import LINUX from psutil import POSIX @@ -54,6 +49,12 @@ if sys.version_info < (2, 7): import unittest2 as unittest # requires "pip install unittest2" else: import unittest + +try: + from unittest import mock # py3 +except ImportError: + import mock # NOQA - requires "pip install mock" + if sys.version_info >= (3, 4): import enum else: |