diff options
author | Vadim Yanitskiy <axilirator@gmail.com> | 2017-07-16 00:30:54 +0700 |
---|---|---|
committer | Vadim Yanitskiy <axilirator@gmail.com> | 2017-11-19 17:35:07 +0700 |
commit | 538bea917b858b3c368adc2a59e070b7ae54c418 (patch) | |
tree | ac96496bbf48884f0f2f6d271dd6090e9ce063a6 /src/target | |
parent | b5e4f26f6fb4429248abd6d0287f00ee13201208 (diff) |
fake_trx: fix compatibility with Python 3
Change-Id: Idce0c631aa3fcd20092a3773558570e442b2fec8
Diffstat (limited to 'src/target')
-rwxr-xr-x | src/target/fake_trx/clck_gen.py | 2 | ||||
-rwxr-xr-x | src/target/fake_trx/ctrl_cmd.py | 2 | ||||
-rwxr-xr-x | src/target/fake_trx/fake_trx.py | 4 | ||||
-rw-r--r-- | src/target/fake_trx/udp_link.py | 5 |
4 files changed, 8 insertions, 5 deletions
diff --git a/src/target/fake_trx/clck_gen.py b/src/target/fake_trx/clck_gen.py index 4ef597f6..f1c1f983 100755 --- a/src/target/fake_trx/clck_gen.py +++ b/src/target/fake_trx/clck_gen.py @@ -94,7 +94,7 @@ class Application: 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 a9c7d68a..e362408f 100755 --- a/src/target/fake_trx/ctrl_cmd.py +++ b/src/target/fake_trx/ctrl_cmd.py @@ -54,7 +54,7 @@ class Application: 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 aaa308d7..b1860716 100755 --- a/src/target/fake_trx/fake_trx.py +++ b/src/target/fake_trx/fake_trx.py @@ -114,12 +114,12 @@ class Application: # 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 3fa50502..0afd1504 100644 --- a/src/target/fake_trx/udp_link.py +++ b/src/target/fake_trx/udp_link.py @@ -41,12 +41,15 @@ class UDPLink: # 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): |