diff --git a/src/execo/conductor.py b/src/execo/conductor.py index e70a8a5e40338413f12290ac124896ac74c73373..4d5827af41766377b1210d8397a9edbd2bfece5d 100644 --- a/src/execo/conductor.py +++ b/src/execo/conductor.py @@ -24,7 +24,7 @@ from .config import configuration import errno, fcntl, logging, os, select, \ signal, sys, threading, time, traceback, \ subprocess, resource, heapq -if sys.version_info.major >= 3: +if sys.version_info >= (3,): import queue, _thread else: import Queue as queue, thread as _thread diff --git a/src/execo/report.py b/src/execo/report.py index e6cb4cf708fe42e75f611bc7e5a512531f81da39..d240d55387aef1f7a2d1fe0fc1a5a10798b3a57c 100644 --- a/src/execo/report.py +++ b/src/execo/report.py @@ -19,7 +19,7 @@ from .log import style from .time_utils import format_date, format_duration import sys -if sys.version_info.major >= 3: +if sys.version_info >= (3,): _BIGNUM = sys.maxsize else: _BIGNUM = sys.maxint diff --git a/src/execo_engine/sweep.py b/src/execo_engine/sweep.py index b8fc44f02e56c0887c1e938f502510f970094aea..30bb88cafef43b47ee77688f7d6819a0a8ac5d1a 100644 --- a/src/execo_engine/sweep.py +++ b/src/execo_engine/sweep.py @@ -18,7 +18,7 @@ import threading, os, fcntl, math, sys import pickle as pickle -if sys.version_info.major >= 3: +if sys.version_info >= (3,): import pickle else: import cPickle as pickle diff --git a/src/execo_engine/utils.py b/src/execo_engine/utils.py index a606f6999e97a0d240255bf5355193159355ce66..cbd0b4007c1628c28acfcecc1be1a52045cc7353 100644 --- a/src/execo_engine/utils.py +++ b/src/execo_engine/utils.py @@ -100,7 +100,7 @@ def slugify(value): more or less inspired / copy pasted from django (see http://stackoverflow.com/questions/295135/turn-a-string-into-a-valid-filename-in-python) """ - if sys.version_info.major >= 3: + if sys.version_info >= (3,): value = str(value) value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore').decode('ascii') value = re.sub('[^\w\s-]', '', value).strip().lower() diff --git a/src/execo_g5k/api_utils.py b/src/execo_g5k/api_utils.py index 2e240e3c5f488dca265c64a5aa65215c7c812998..02ae61117d1cef31b0e6d11567bea17491ec35cd 100644 --- a/src/execo_g5k/api_utils.py +++ b/src/execo_g5k/api_utils.py @@ -50,7 +50,7 @@ import json, re, itertools import threading import logging, sys from os import makedirs, environ, path -if sys.version_info.major >= 3: +if sys.version_info >= (3,): from pickle import load, dump else: from cPickle import load, dump