removed (object), prepare new RTScanner

1 files changed, 25 insertions, 12 deletions

diff --git a/emitter.py b/emitter.py
index 9f37906..afbffc4 100644
--- a/emitter.py
+++ b/emitter.py
@@ -13,7 +13,7 @@ from ruamel.yaml.events import *  # NOQA
 
 # fmt: off
 from ruamel.yaml.compat import _F, nprint, dbg, DBG_EVENT, \
-    check_anchorname_char
+    check_anchorname_char, nprintf
 # fmt: on
 
 if False:  # MYPY
@@ -27,7 +27,7 @@ class EmitterError(YAMLError):
     pass
 
 
-class ScalarAnalysis(object):
+class ScalarAnalysis:
     def __init__(
         self,
         scalar,
@@ -50,7 +50,7 @@ class ScalarAnalysis(object):
         self.allow_block = allow_block
 
 
-class Indents(object):
+class Indents:
     # replacement for the list based stack of None/int
     def __init__(self):
         # type: () -> None
@@ -87,7 +87,7 @@ class Indents(object):
         return len(self.values)
 
 
-class Emitter(object):
+class Emitter:
     # fmt: off
     DEFAULT_TAG_PREFIXES = {
         '!': '!',
@@ -905,7 +905,12 @@ class Emitter(object):
                 # comment following a folded scalar must dedent (issue 376)
                 self.event.comment[0].column = self.indent - 1
         elif self.style == '|':
-            self.write_literal(self.analysis.scalar, self.event.comment)
+            # self.write_literal(self.analysis.scalar, self.event.comment)
+            try:
+                cmx = self.event.comment[1][0]
+            except (IndexError, TypeError):
+                cmx = ""
+            self.write_literal(self.analysis.scalar, cmx)
             if (
                 self.event.comment
                 and self.event.comment[0]
@@ -1557,13 +1562,21 @@ class Emitter(object):
     def write_literal(self, text, comment=None):
         # type: (Any, Any) -> None
         hints, _indent, _indicator = self.determine_block_hints(text)
-        self.write_indicator('|' + hints, True)
-        try:
-            comment = comment[1][0]
-            if comment:
-                self.stream.write(comment)
-        except (TypeError, IndexError):
-            pass
+        #if comment is not None:
+        #    try:
+        #        hints += comment[1][0]
+        #    except (TypeError, IndexError) as e:
+        #        pass
+        if not isinstance(comment, str):
+            comment = ''
+        self.write_indicator('|' + hints + comment, True)
+        #try:
+        #    nprintf('selfev', comment)
+        #    cmx = comment[1][0]
+        #    if cmx:
+        #        self.stream.write(cmx)
+        #except (TypeError, IndexError) as e:
+        #    pass
         if _indicator == '+':
             self.open_ended = True
         self.write_line_break()