Several fixes after failing tests

Author: Arusekk

tests/twisted/gabbletest.py

@@ -233,7 +233,7 @@ def streamStarted(self, root=None):
 
     def auth(self, auth):
         assert (base64.b64decode(bytes(auth)) ==
-            b'\x00%s\x00%s' % (self.username, self.password))
+            b'\x00%s\x00%s' % (self.username.encode(), self.password.encode()))
 
         success = domish.Element((ns.NS_XMPP_SASL, 'success'))
         self.xmlstream.send(success)
@@ -555,7 +555,7 @@ def disconnect_conn(q, conn, stream, expected_before=[], expected_after=[]):
     return before_events[:-2], after_events[:-1]
 
 def element_repr(element):
-    """__repr__ cannot safely return non-ASCII: see
+    r"""__repr__ cannot safely return non-ASCII: see
     <http://bugs.python.org/issue5876>. So we print non-ASCII characters as
     \uXXXX escapes in debug output
 

tests/twisted/sasl/telepathy-password.py

@@ -7,7 +7,7 @@
 import constants as cs
 from saslutil import connect_and_get_sasl_channel
 
-PASSWORD = "pass"
+PASSWORD = b"pass"
 
 def test_close_straight_after_accept(q, bus, conn, stream):
     chan, props = connect_and_get_sasl_channel(q, bus, conn)

tools/c-constants-gen.py

@@ -17,7 +17,7 @@ def __call__(self):
         self.do_footer()
 
     def write(self, code):
-        stdout.write(code.encode('utf-8'))
+        stdout.write(code)
 
     # Header
     def do_header(self):

tools/glib-interfaces-gen.py

@@ -14,10 +14,10 @@ def __init__(self, prefix, implfile, declfile, dom):
         self.spec = get_by_path(dom, "spec")[0]
 
     def h(self, code):
-        self.decls.write(code.encode('utf-8'))
+        self.decls.write(code)
 
     def c(self, code):
-        self.impls.write(code.encode('utf-8'))
+        self.impls.write(code)
 
     def __call__(self):
         for f in self.h, self.c: