From 270d5ddc31c26b62379e3caa9044dd75ccc71847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= Date: Sun, 4 Mar 2018 10:20:27 +0100 Subject: New upstream version 0.7.0+dfsg --- silx/io/configdict.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'silx/io/configdict.py') diff --git a/silx/io/configdict.py b/silx/io/configdict.py index 21e24b7..2ba9755 100644 --- a/silx/io/configdict.py +++ b/silx/io/configdict.py @@ -1,5 +1,5 @@ # /*########################################################################## -# Copyright (C) 2004-2016 European Synchrotron Radiation Facility +# Copyright (C) 2004-2018 European Synchrotron Radiation Facility # # This file is part of the PyMca X-ray Fluorescence Toolkit developed at # the ESRF by the Software group. @@ -92,7 +92,7 @@ from collections import OrderedDict import numpy import re import sys -if sys.version < '3.0': +if sys.version_info < (3, ): import ConfigParser as configparser else: import configparser @@ -382,7 +382,7 @@ class ConfigDict(OrderedDict): dictionary :param sections: If not ``None``, add only the content of the specified sections - :type sections: list + :type sections: List """ filelist = self.__tolist(filelist) sections = self.__tolist(sections) @@ -475,7 +475,7 @@ class ConfigDict(OrderedDict): # Escape commas sstr = sstr.replace(",", "\,") - if sys.version > '3.0': + if sys.version_info >= (3, ): # Escape % characters except in "%%" and "%(" sstr = re.sub(r'%([^%\(])', r'%%\1', sstr) -- cgit v1.2.3