From 47dd2a0bdfb74ea2f0f673c1234b0e792d67fa8f Mon Sep 17 00:00:00 2001
From: Daniel Hiepler <daniel@sicyon.de>
Date: Tue, 12 Apr 2016 14:53:15 +0200
Subject: [PATCH] some more encoding fixes

---
 Spectrum2/backend.py | 2 +-
 buddy.py             | 2 +-
 registersession.py   | 2 +-
 yowsupwrapper.py     | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Spectrum2/backend.py b/Spectrum2/backend.py
index 23a343e..36f463b 100644
--- a/Spectrum2/backend.py
+++ b/Spectrum2/backend.py
@@ -388,7 +388,7 @@ class SpectrumBackend:
 
 
 	def handleDataRead(self, data):
-		self.m_data += bytes(data)
+		self.m_data += data
 		while len(self.m_data) != 0:
 			expected_size = 0
 			if (len(self.m_data) >= 4):
diff --git a/buddy.py b/buddy.py
index c3d4e4c..2537f67 100644
--- a/buddy.py
+++ b/buddy.py
@@ -39,7 +39,7 @@ class Buddy():
 	def __init__(self, owner, number, nick, statusMsg, groups, image_hash):
 		self.nick = nick
 		self.owner = owner
-		self.number = number
+		self.number = "%s" % number
 		self.groups = groups
 		self.image_hash = image_hash if image_hash is not None else ""
 		self.statusMsg = u""
diff --git a/registersession.py b/registersession.py
index efc7351..7a939e2 100644
--- a/registersession.py
+++ b/registersession.py
@@ -36,7 +36,7 @@ class RegisterSession(YowsupApp):
 				self.backend.handleMessage(self.user, 'bot',
 						'Country code must be a number')
 			else: # Succeded in decoding country code
-				country_code = str(country_code)
+				country_code = "%s" % country_code
 				if country_code != self.number[:len(country_code)]:
 					self.backend.handleMessage(self.user,
 							'bot', 'Number does not start with provided country code')
diff --git a/yowsupwrapper.py b/yowsupwrapper.py
index f60a5e7..2f5c162 100644
--- a/yowsupwrapper.py
+++ b/yowsupwrapper.py
@@ -181,7 +181,7 @@ class YowsupApp(object):
 			- to: (xxxxxxxxxx@s.whatsapp.net) who to send the message to
 			- message: (str) the body of the message
 		"""
-		messageEntity = TextMessageProtocolEntity(message, to = to)
+		messageEntity = TextMessageProtocolEntity(message.encode('utf-8'), to = to)
 		self.sendEntity(messageEntity)
 		return messageEntity.getId()
 
@@ -566,7 +566,7 @@ class YowsupApp(object):
 		"""
 		pass
 
-	def	onTextMessage(self, _id, _from, to, notify, timestamp, participant, offline, retry, body):
+	def onTextMessage(self, _id, _from, to, notify, timestamp, participant, offline, retry, body):
 		"""
 		Called when text message is received
 
@@ -709,7 +709,7 @@ class YowsupApp(object):
 	def sendEntity(self, entity):
 		"""Sends an entity down the stack (as if YowsupAppLayer called toLower)"""
 		self.stack.broadcastEvent(YowLayerEvent(YowsupAppLayer.TO_LOWER_EVENT,
-			entity = bytearray(entity)
+			entity = entity
 		))
 
 	def sendIq(self, iq, onSuccess = None, onError = None):