summaryrefslogtreecommitdiff
path: root/reconfigure
diff options
context:
space:
mode:
authorAndrew Shadura <andrew@shadura.me>2015-08-27 18:52:09 +0200
committerAndrew Shadura <andrew@shadura.me>2015-08-27 18:58:50 +0200
commit6f091a8654ba2a6b40a9b8a7725eb78e4e284856 (patch)
tree9401f3fc8f9344e83edba56245a758ac2d5960fa /reconfigure
parent8864659127afd728d2ae3f10664f65bcda6f7417 (diff)
Use system-provided python*-iniparse
Diffstat (limited to 'reconfigure')
-rw-r--r--reconfigure/parsers/ini.py2
-rw-r--r--reconfigure/parsers/iniparse/config.py18
2 files changed, 10 insertions, 10 deletions
diff --git a/reconfigure/parsers/ini.py b/reconfigure/parsers/ini.py
index 2f95d33..fe91422 100644
--- a/reconfigure/parsers/ini.py
+++ b/reconfigure/parsers/ini.py
@@ -2,7 +2,7 @@ import six
from reconfigure.nodes import *
from reconfigure.parsers import BaseParser
-from reconfigure.parsers.iniparse import INIConfig
+from iniparse import INIConfig
try:
from StringIO import StringIO
diff --git a/reconfigure/parsers/iniparse/config.py b/reconfigure/parsers/iniparse/config.py
index cc37ac4..d007f16 100644
--- a/reconfigure/parsers/iniparse/config.py
+++ b/reconfigure/parsers/iniparse/config.py
@@ -143,7 +143,7 @@ class BasicConfig(ConfigNamespace):
>>> n.aaa = 42
>>> del n.x
- >>> print(n)
+ >>> print n
aaa = 42
name.first = paramjit
name.last = oberoi
@@ -152,7 +152,7 @@ class BasicConfig(ConfigNamespace):
>>> isinstance(n.name, ConfigNamespace)
True
- >>> print(n.name)
+ >>> print n.name
first = paramjit
last = oberoi
>>> sorted(list(n.name))
@@ -160,8 +160,8 @@ class BasicConfig(ConfigNamespace):
Finally, values can be read from a file as follows:
- >>> from io import StringIO
- >>> sio = StringIO(u'''
+ >>> from StringIO import StringIO
+ >>> sio = StringIO('''
... # comment
... ui.height = 100
... ui.width = 150
@@ -171,7 +171,7 @@ class BasicConfig(ConfigNamespace):
... ''')
>>> n = BasicConfig()
>>> n._readfp(sio)
- >>> print(n)
+ >>> print n
complexity = medium
data.secret.password = goodness=gracious me
have_python
@@ -199,7 +199,7 @@ class BasicConfig(ConfigNamespace):
def __str__(self, prefix=''):
lines = []
- keys = list(self._data.keys())
+ keys = self._data.keys()
keys.sort()
for name in keys:
value = self._data[name]
@@ -258,7 +258,7 @@ def update_config(target, source):
>>> n.ui.display_clock = True
>>> n.ui.display_qlength = True
>>> n.ui.width = 150
- >>> print(n)
+ >>> print n
playlist.expand_playlist = True
ui.display_clock = True
ui.display_qlength = True
@@ -267,7 +267,7 @@ def update_config(target, source):
>>> from iniparse import ini
>>> i = ini.INIConfig()
>>> update_config(i, n)
- >>> print(i)
+ >>> print i
[playlist]
expand_playlist = True
<BLANKLINE>
@@ -277,7 +277,7 @@ def update_config(target, source):
width = 150
"""
- for name in sorted(source):
+ for name in source:
value = source[name]
if isinstance(value, ConfigNamespace):
if name in target: