remove python 2 specific code

add future deprecation warning to old style functions

1 files changed, 10 insertions, 2 deletions

diff --git a/events.py b/events.py
index 58b2121..693519d 100644
--- a/events.py
+++ b/events.py
@@ -1,5 +1,7 @@
 # coding: utf-8
 
+from ruamel.yaml.compat import _F
+
 # Abstract classes.
 
 if False:  # MYPY
@@ -30,10 +32,16 @@ class Event(object):
             for key in ['anchor', 'tag', 'implicit', 'value', 'flow_style', 'style']
             if hasattr(self, key)
         ]
-        arguments = ', '.join(['%s=%r' % (key, getattr(self, key)) for key in attributes])
+        arguments = ', '.join(
+            [_F('{key!s}={attr!r})', key=key, attr=getattr(self, key)) for key in attributes]
+        )
         if self.comment not in [None, CommentCheck]:
             arguments += ', comment={!r}'.format(self.comment)
-        return '%s(%s)' % (self.__class__.__name__, arguments)
+        return _F(
+            '{self_class_name!s}{}arguments!s}',
+            self_class_name=self.__class__.__name__,
+            arguments=arguments,
+        )
 
 
 class NodeEvent(Event):