pep8 compliance, util.load_yaml_guess_indent0.11.2

1 files changed, 6 insertions, 62 deletions

diff --git a/configobjwalker.py b/configobjwalker.py
index 1fe6f35..bab910c 100644
--- a/configobjwalker.py
+++ b/configobjwalker.py
@@ -1,65 +1,9 @@
+# coding: utf-8
 
-
-def configobj_walker(cfg):
-    """
-    walks over a ConfigObj (INI file with comments) generating
-    corresponding YAML output (including comments
-    """
-    from configobj import ConfigObj
-    assert isinstance(cfg, ConfigObj)
-    for c in cfg.initial_comment:
-        if c.strip():
-            yield c
-    for s in _walk_section(cfg):
-        if s.strip():
-            yield s
-    for c in cfg.final_comment:
-        if c.strip():
-            yield c
+import warnings
+from ruamel.yaml.util import configobj_walker as new_configobj_walker
 
 
-def _walk_section(s, level=0):
-    from configobj import Section
-    assert isinstance(s, Section)
-    indent = u'  ' * level
-    for name in s.scalars:
-        for c in s.comments[name]:
-            yield indent + c.strip()
-        x = s[name]
-        if u'\n' in x:
-            i = indent + u'  '
-            x = u'|\n' + i + x.strip().replace(u'\n', u'\n' + i)
-        elif ':' in x:
-            x = u"'" + x.replace(u"'", u"''") + u"'"
-        line = u'{0}{1}: {2}'.format(indent, name, x)
-        c = s.inline_comments[name]
-        if c:
-            line += u' ' + c
-        yield line
-    for name in s.sections:
-        for c in s.comments[name]:
-            yield indent + c.strip()
-        line = u'{0}{1}:'.format(indent, name)
-        c = s.inline_comments[name]
-        if c:
-            line += u' ' + c
-        yield line
-        for val in _walk_section(s[name], level=level+1):
-            yield val
-
-# def config_obj_2_rt_yaml(cfg):
-#     from .comments import CommentedMap, CommentedSeq
-#     from configobj import ConfigObj
-#     assert isinstance(cfg, ConfigObj)
-#     #for c in cfg.initial_comment:
-#     #    if c.strip():
-#     #        pass
-#     cm = CommentedMap()
-#     for name in s.sections:
-#         cm[name] = d = CommentedMap()
-#
-#
-#     #for c in cfg.final_comment:
-#     #    if c.strip():
-#     #        yield c
-#     return cm
+def configobj_walker(cfg):
+    warnings.warn("configobj_walker has move to ruamel.yaml.util, please update your code")
+    return new_configobj_walker(cfg)