diff options
Diffstat (limited to 'reconfigure/parsers/iniparse/ini.py')
| -rw-r--r-- | reconfigure/parsers/iniparse/ini.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/reconfigure/parsers/iniparse/ini.py b/reconfigure/parsers/iniparse/ini.py index 7881fd2..84611ba 100644 --- a/reconfigure/parsers/iniparse/ini.py +++ b/reconfigure/parsers/iniparse/ini.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals """Access and/or modify INI files * Compatiable with ConfigParser @@ -42,9 +43,12 @@ Example: # Backward-compatiable with ConfigParser import re -from ConfigParser import DEFAULTSECT, ParsingError, MissingSectionHeaderError +try: + from ConfigParser import DEFAULTSECT, ParsingError, MissingSectionHeaderError +except ImportError: + from configparser import DEFAULTSECT, ParsingError, MissingSectionHeaderError -import config +from reconfigure.parsers.iniparse import config class LineType(object): line = None @@ -465,7 +469,7 @@ class INIConfig(config.ConfigNamespace): self._sections = {} if defaults is None: defaults = {} self._defaults = INISection(LineContainer(), optionxformsource=self) - for name, value in defaults.iteritems(): + for name, value in defaults.items(): self._defaults[name] = value if fp is not None: self._readfp(fp) @@ -514,7 +518,7 @@ class INIConfig(config.ConfigNamespace): def __str__(self): if self._bom: - fmt = u'\ufeff%s' + fmt = '\ufeff%s' else: fmt = '%s' return fmt % self._data.__str__() @@ -551,8 +555,8 @@ class INIConfig(config.ConfigNamespace): for line in readline_iterator(fp): # Check for BOM on first line - if linecount == 0 and isinstance(line, unicode): - if line[0] == u'\ufeff': + if linecount == 0: + if line[0] == '\ufeff': line = line[1:] self._bom = True |