From b2a447dbb1f886343c20263829659f29354ec123 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Thu, 18 Jun 2015 03:38:14 +0200 Subject: fix #635: [UNIX] crash on module import if 'enum' package is installed on python < 3.4 --- psutil/_common.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'psutil/_common.py') diff --git a/psutil/_common.py b/psutil/_common.py index 132d9d59..e9acf595 100644 --- a/psutil/_common.py +++ b/psutil/_common.py @@ -12,17 +12,19 @@ import functools import os import socket import stat +import sys +from collections import namedtuple +from socket import AF_INET, SOCK_STREAM, SOCK_DGRAM try: import threading except ImportError: import dummy_threading as threading -try: - import enum # py >= 3.4 -except ImportError: + +if sys.version_info >= (3, 4): + import enum +else: enum = None -from collections import namedtuple -from socket import AF_INET, SOCK_STREAM, SOCK_DGRAM # --- constants -- cgit v1.2.1