From b610c5030019f41e9b04ea967abfbf6a39cbd709 Mon Sep 17 00:00:00 2001 From: Vasily Evseenko Date: Thu, 3 Feb 2022 18:34:31 +0300 Subject: [PATCH] Remove python2 compatibility --- stdeb.cfg | 2 -- telemetry/cli.py | 31 ++++++++++++------------------- telemetry/common.py | 12 +----------- telemetry/conf/__init__.py | 10 ---------- telemetry/config_parser.py | 10 ---------- telemetry/latency_test.py | 8 -------- telemetry/mavlink.py | 4 +--- telemetry/mavlink_protocol.py | 10 ---------- telemetry/proxy.py | 12 +----------- telemetry/server.py | 12 +----------- telemetry/tests/test_proxy.py | 11 ----------- telemetry/tests/test_tuntap.py | 9 --------- telemetry/tuntap.py | 14 ++------------ version.py | 2 -- 14 files changed, 18 insertions(+), 129 deletions(-) diff --git a/stdeb.cfg b/stdeb.cfg index aeefef2..9a12756 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -1,5 +1,3 @@ [DEFAULT] -Depends: python-twisted, libpcap-dev, libsodium-dev, python-pyroute2, python-future, python-configparser, python-serial Depends3: python3-twisted, libpcap-dev, libsodium-dev, python3-pyroute2, python3-future, python3-serial -Package: wifibroadcast Package3: wifibroadcast diff --git a/telemetry/cli.py b/telemetry/cli.py index ae635ac..6c7ea71 100644 --- a/telemetry/cli.py +++ b/telemetry/cli.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2018, 2019 Vasily Evseenko +# Copyright (C) 2018-2022 Vasily Evseenko # # This program is free software; you can redistribute it and/or modify @@ -18,15 +18,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import - -from future import standard_library -standard_library.install_aliases() - -from builtins import * import sys import curses import curses.textpad @@ -172,19 +163,21 @@ def main(): print("Usage: %s " % (sys.argv[0],), file=stderr) sys.exit(1) - fd = tempfile.TemporaryFile() + fd = tempfile.TemporaryFile(mode='w+', encoding='utf-8') log.startLogging(fd) stdscr = curses.initscr() - curses.noecho() - curses.cbreak() - curses.curs_set(0) - stdscr.keypad(1) - - reactor.callWhenRunning(lambda: defer.maybeDeferred(init, stdscr, sys.argv[1])\ + try: + curses.noecho() + curses.cbreak() + curses.curs_set(0) + stdscr.keypad(True) + reactor.callWhenRunning(lambda: defer.maybeDeferred(init, stdscr, sys.argv[1])\ .addErrback(abort_on_crash)) - reactor.run() - curses.endwin() + reactor.run() + finally: + curses.endwin() + rc = exit_status() if rc: diff --git a/telemetry/common.py b/telemetry/common.py index 1c28032..7bfc0b8 100644 --- a/telemetry/common.py +++ b/telemetry/common.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2018, 2019 Vasily Evseenko +# Copyright (C) 2018-2022 Vasily Evseenko # # This program is free software; you can redistribute it and/or modify @@ -18,16 +18,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -from __future__ import unicode_literals -from __future__ import print_function -from __future__ import division -from __future__ import absolute_import - -from future import standard_library -standard_library.install_aliases() - -from builtins import * - from twisted.python import log from twisted.internet import reactor, defer, task from telemetry.conf import settings diff --git a/telemetry/conf/__init__.py b/telemetry/conf/__init__.py index e7ee044..1cd0c42 100644 --- a/telemetry/conf/__init__.py +++ b/telemetry/conf/__init__.py @@ -1,16 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import division -from __future__ import absolute_import - -from future import standard_library -standard_library.install_aliases() - -from builtins import * - import os import sys from telemetry import config_parser diff --git a/telemetry/config_parser.py b/telemetry/config_parser.py index f3bd03c..940175c 100644 --- a/telemetry/config_parser.py +++ b/telemetry/config_parser.py @@ -18,16 +18,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -from __future__ import unicode_literals -from __future__ import print_function -from __future__ import division -from __future__ import absolute_import - -from future import standard_library -standard_library.install_aliases() - -from builtins import * - import configparser import ast import copy diff --git a/telemetry/latency_test.py b/telemetry/latency_test.py index dbe6066..6fc90f0 100755 --- a/telemetry/latency_test.py +++ b/telemetry/latency_test.py @@ -1,14 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from __future__ import division -from __future__ import unicode_literals -from __future__ import print_function -from __future__ import absolute_import - -from future import standard_library -standard_library.install_aliases() -from builtins import * import sys import time import struct diff --git a/telemetry/mavlink.py b/telemetry/mavlink.py index 315495b..c31a93d 100644 --- a/telemetry/mavlink.py +++ b/telemetry/mavlink.py @@ -5,9 +5,7 @@ Generated from: all.xml,ardupilotmega.xml,common.xml,development.xml,icarous.xml Note: this file has been auto-generated. DO NOT EDIT ''' -from __future__ import print_function -from builtins import range -from builtins import object + import struct, array, time, json, os, sys, platform import hashlib diff --git a/telemetry/mavlink_protocol.py b/telemetry/mavlink_protocol.py index 482d693..b119ff2 100644 --- a/telemetry/mavlink_protocol.py +++ b/telemetry/mavlink_protocol.py @@ -18,16 +18,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -from __future__ import absolute_import -from __future__ import unicode_literals -from __future__ import print_function -from __future__ import division - -from future import standard_library -standard_library.install_aliases() - -from builtins import * - from . import mavlink from twisted.python import log from twisted.internet import reactor, defer diff --git a/telemetry/proxy.py b/telemetry/proxy.py index 2bf655a..f17b636 100644 --- a/telemetry/proxy.py +++ b/telemetry/proxy.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2018-2021 Vasily Evseenko +# Copyright (C) 2018-2022 Vasily Evseenko # # This program is free software; you can redistribute it and/or modify @@ -18,16 +18,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -from __future__ import absolute_import -from __future__ import unicode_literals -from __future__ import print_function -from __future__ import division - -from future import standard_library -standard_library.install_aliases() - -from builtins import * - import struct import os diff --git a/telemetry/server.py b/telemetry/server.py index e1e6825..4e313e7 100644 --- a/telemetry/server.py +++ b/telemetry/server.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2018, 2019 Vasily Evseenko +# Copyright (C) 2018-2022 Vasily Evseenko # # This program is free software; you can redistribute it and/or modify @@ -18,16 +18,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -from __future__ import absolute_import -from __future__ import unicode_literals -from __future__ import print_function -from __future__ import division - -from future import standard_library -standard_library.install_aliases() - -from builtins import * - import sys import time import json diff --git a/telemetry/tests/test_proxy.py b/telemetry/tests/test_proxy.py index 7f2b436..24e3a0a 100644 --- a/telemetry/tests/test_proxy.py +++ b/telemetry/tests/test_proxy.py @@ -1,17 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from __future__ import unicode_literals -from __future__ import print_function -from __future__ import division -from __future__ import absolute_import - -from future import standard_library -standard_library.install_aliases() - -from builtins import * -from builtins import range - import time from twisted.python import log from twisted.trial import unittest diff --git a/telemetry/tests/test_tuntap.py b/telemetry/tests/test_tuntap.py index 309fd5b..a07b9e6 100644 --- a/telemetry/tests/test_tuntap.py +++ b/telemetry/tests/test_tuntap.py @@ -1,15 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from __future__ import unicode_literals -from __future__ import print_function -from __future__ import division -from __future__ import absolute_import - -from future import standard_library -standard_library.install_aliases() -from builtins import * - import os import time from twisted.python import log diff --git a/telemetry/tuntap.py b/telemetry/tuntap.py index 0086d5a..66dc609 100644 --- a/telemetry/tuntap.py +++ b/telemetry/tuntap.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2018, 2019 Vasily Evseenko +# Copyright (C) 2018-2022 Vasily Evseenko # # This program is free software; you can redistribute it and/or modify @@ -18,16 +18,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -from __future__ import absolute_import -from __future__ import unicode_literals -from __future__ import print_function -from __future__ import division - -from future import standard_library -standard_library.install_aliases() - -from builtins import * - import os from . import mavlink import fcntl @@ -57,7 +47,7 @@ class TUNTAPTransport(abstract.FileDescriptor): try: # We don't need packet info mode |= self.IFF_NO_PI - fcntl.ioctl(self.fd, self.TUNSETIFF, struct.pack('16sH', bytes(name, 'ascii'), mode)) + fcntl.ioctl(self.fd, self.TUNSETIFF, struct.pack('16sH', name.encode('ascii'), mode)) with closing(IPRoute()) as ip: ifidx = ip.link_lookup(ifname=name)[0] _addr, _mask = addr.split('/') diff --git a/version.py b/version.py index 741cf81..6e18c48 100755 --- a/version.py +++ b/version.py @@ -1,8 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from __future__ import print_function - import sys import time import datetime