[PATCH] osmocom-bb[master]: fake_trx: fix compatibility with Python 3

[Harald Welte]

Review at  https://gerrit.osmocom.org/6735

fake_trx: fix compatibility with Python 3

Change-Id: Idce0c631aa3fcd20092a3773558570e442b2fec8
---
M src/target/fake_trx/clck_gen.py
M src/target/fake_trx/ctrl_cmd.py
M src/target/fake_trx/fake_trx.py
M src/target/fake_trx/udp_link.py
4 files changed, 8 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/35/6735/1

diff --git a/src/target/fake_trx/clck_gen.py b/src/target/fake_trx/clck_gen.py
index 4ef597f..f1c1f98 100755
--- a/src/target/fake_trx/clck_gen.py
+++ b/src/target/fake_trx/clck_gen.py
@@ -94,7 +94,7 @@
 		self.clck.start()
 
 	def sig_handler(self, signum, frame):
-		print "Signal %d received" % signum
+		print("Signal %d received" % signum)
 		if signum is signal.SIGINT:
 			self.clck.stop()
 			self.link.shutdown()
diff --git a/src/target/fake_trx/ctrl_cmd.py b/src/target/fake_trx/ctrl_cmd.py
index a9c7d68..e362408 100755
--- a/src/target/fake_trx/ctrl_cmd.py
+++ b/src/target/fake_trx/ctrl_cmd.py
@@ -54,7 +54,7 @@
 
 			if self.ctrl_link.sock in r_event:
 				data, addr = self.ctrl_link.sock.recvfrom(128)
-				sys.stdout.write("\r%s\n" % data)
+				sys.stdout.write("\r%s\n" % data.decode())
 				sys.stdout.flush()
 
 	def handle_cmd(self, cmd):
diff --git a/src/target/fake_trx/fake_trx.py b/src/target/fake_trx/fake_trx.py
index aaa308d..b186071 100755
--- a/src/target/fake_trx/fake_trx.py
+++ b/src/target/fake_trx/fake_trx.py
@@ -114,12 +114,12 @@
 			# CTRL commands from BTS
 			if self.bts_ctrl.sock in r_event:
 				data, addr = self.bts_ctrl.sock.recvfrom(128)
-				self.bts_ctrl.handle_rx(data)
+				self.bts_ctrl.handle_rx(data.decode())
 
 			# CTRL commands from BB
 			if self.bb_ctrl.sock in r_event:
 				data, addr = self.bb_ctrl.sock.recvfrom(128)
-				self.bb_ctrl.handle_rx(data)
+				self.bb_ctrl.handle_rx(data.decode())
 
 	def shutdown(self):
 		print("[i] Shutting down...")
diff --git a/src/target/fake_trx/udp_link.py b/src/target/fake_trx/udp_link.py
index 3fa5050..0afd150 100644
--- a/src/target/fake_trx/udp_link.py
+++ b/src/target/fake_trx/udp_link.py
@@ -41,12 +41,15 @@
 		# Check for incoming data
 		if self.sock in r_event:
 			data, addr = self.sock.recvfrom(128)
-			self.handle_rx(data)
+			self.handle_rx(data.decode())
 
 	def shutdown(self):
 		self.sock.close();
 
 	def send(self, data):
+		if type(data) not in [bytearray, bytes]:
+			data = data.encode()
+
 		self.sock.sendto(data, (self.remote_addr, self.remote_port))
 
 	def handle_rx(self, data):

-- 
To view, visit https://gerrit.osmocom.org/6735
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idce0c631aa3fcd20092a3773558570e442b2fec8
Gerrit-PatchSet: 1
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>