summaryrefslogtreecommitdiff
path: root/silx/io/configdict.py
diff options
context:
space:
mode:
authorPicca Frédéric-Emmanuel <picca@debian.org>2018-03-04 10:20:27 +0100
committerPicca Frédéric-Emmanuel <picca@debian.org>2018-03-04 10:20:27 +0100
commit270d5ddc31c26b62379e3caa9044dd75ccc71847 (patch)
tree55c5bfc851dfce7172d335cd2405b214323e3caf /silx/io/configdict.py
parente19c96eff0c310c06c4f268c8b80cb33bd08996f (diff)
New upstream version 0.7.0+dfsg
Diffstat (limited to 'silx/io/configdict.py')
-rw-r--r--silx/io/configdict.py8
1 files changed, 4 insertions, 4 deletions
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)