python-nbxmpp: Fix deprecation warning, cipher_list must be byte... - Commits

2 Apr 2016

changeset 52ba62dfad93 in /home/hg/repos/python-nbxmpp
details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=52ba62dfad93
description: Fix deprecation warning, cipher_list must be bytes and not str.
diffstat:
nbxmpp/tls_nb.py |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
diffs (15 lines):
diff -r 06830be9dcec -r 52ba62dfad93 nbxmpp/tls_nb.py

--- a/nbxmpp/tls_nb.py	Thu Dec 17 19:47:36 2015 +0100
+++ b/nbxmpp/tls_nb.py	Sat Apr 02 16:48:48 2016 +0100
@@ -267,9 +267,9 @@
         self.cacerts = cacerts
         self.mycerts = mycerts
         if cipher_list is None:
-            self.cipher_list = 'HIGH:!aNULL:RC4-SHA'
+            self.cipher_list = b'HIGH:!aNULL:RC4-SHA'
         else:
-            self.cipher_list = cipher_list
+            self.cipher_list = cipher_list.encode('ascii')
         if tls_version is None:
             self.tls_version = '1.0'
         else:

    