Spiri/wfb-ng
4
0
Fork 0
forked from Mirror/wfb-ng
Code Pull Requests Activity

Remove python2 compatibility

Browse Source
This commit is contained in:
Vasily Evseenko 2022-02-03 18:34:31 +03:00
parent a902805100
commit b610c50300
14 changed files with 18 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stdeb.cfg
View File

@ -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

31
telemetry/cli.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Copyright (C) 2018, 2019 Vasily Evseenko <svpcom@p2ptech.org>
# Copyright (C) 2018-2022 Vasily Evseenko <svpcom@p2ptech.org>
#
# 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 <profile>" % (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:

12
telemetry/common.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Copyright (C) 2018, 2019 Vasily Evseenko <svpcom@p2ptech.org>
# Copyright (C) 2018-2022 Vasily Evseenko <svpcom@p2ptech.org>
#
# 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

10
telemetry/conf/__init__.py
View File

@ -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

10
telemetry/config_parser.py
View File

@ -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

8
telemetry/latency_test.py
View File

@ -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

4
telemetry/mavlink.py
View File

@ -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

10
telemetry/mavlink_protocol.py
View File

@ -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

12
telemetry/proxy.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Copyright (C) 2018-2021 Vasily Evseenko <svpcom@p2ptech.org>
# Copyright (C) 2018-2022 Vasily Evseenko <svpcom@p2ptech.org>
#
# 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

12
telemetry/server.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Copyright (C) 2018, 2019 Vasily Evseenko <svpcom@p2ptech.org>
# Copyright (C) 2018-2022 Vasily Evseenko <svpcom@p2ptech.org>
#
# 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

11
telemetry/tests/test_proxy.py
View File

@ -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

9
telemetry/tests/test_tuntap.py
View File

@ -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

14
telemetry/tuntap.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Copyright (C) 2018, 2019 Vasily Evseenko <svpcom@p2ptech.org>
# Copyright (C) 2018-2022 Vasily Evseenko <svpcom@p2ptech.org>
#
# 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('/')

2
version.py
View File

@ -1,8 +1,6 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
from __future__ import print_function
import sys
import time
import datetime