- more python3 fixes, dropped python2 support

[tld-builder.git] / TLD_Builder / notify.py

diff --git a/TLD_Builder/notify.py b/TLD_Builder/notify.py
index ed5df8b432346997c8f960fffe44967ac39d8d87..71b269c77cfe11e2d858cfc3cda4ce9cf5c1dcf5 100644 (file)
--- a/TLD_Builder/notify.py
+++ b/TLD_Builder/notify.py
@@ -1,11 +1,7 @@
 # vi: encoding=utf-8 ts=8 sts=4 sw=4 et
 
 import sys
-if sys.version_info[0] == 2:
-    import StringIO
-else:
-    from io import StringIO
-
+from io import StringIO
 import mailer
 import gpg
 import util
@@ -14,15 +10,15 @@ from config import config
 
 class Notifier:
     def __init__(self, g):
-        self.xml = StringIO.StringIO()
+        self.xml = StringIO()
         self.xml.write("<notification group-id='%s' builder='%s'>\n" % \
                         (g.id, config.builder))
 
     def send(self, r):
-        sio = StringIO.StringIO()
+        sio = StringIO()
         self.xml.write("</notification>\n")
         self.xml.seek(0)
-        sio.write(gpg.sign(self.xml.read()))
+        sio.write(util.to_str(gpg.sign(self.xml.read())))
         self.xml = None
         sio.seek(0)
         notifyq.init(r)