Merge branch 'master' into websocket-support-on-iosim-tests-master

NEWS.md

@@ -1,5 +1,9 @@
 User-visible changes in "magic-wormhole-transit-relay":
 
+## unreleased
+
+* drop Python 2, Python 3.5 and 3.6 support
+
 ## Release 0.2.1 (11-Sep-2019)
 
 * listen on IPv4+IPv6 properly (#12)

misc/migrate_usage_db.py

@@ -18,7 +18,6 @@ The resuting "usage.sqlite" should be passed into --usage-db=, e.g. "twist
 transitrelay --usage=.../PATH/TO/usage.sqlite".
 """
 
-from __future__ import unicode_literals, print_function
 import sys
 from wormhole_transit_relay.database import open_existing_db, create_db
 

misc/munin/wormhole_transit_active

@@ -7,7 +7,6 @@ Use the following in /etc/munin/plugin-conf.d/wormhole :
 env.usagedb /path/to/your/wormhole/server/usage.sqlite
 """
 
-from __future__ import print_function
 import os, sys, time, sqlite3
 
 CONFIG = """\

misc/munin/wormhole_transit_bytes

@@ -7,7 +7,6 @@ Use the following in /etc/munin/plugin-conf.d/wormhole :
 env.usagedb /path/to/your/wormhole/server/usage.sqlite
 """
 
-from __future__ import print_function
 import os, sys, time, sqlite3
 
 CONFIG = """\

misc/munin/wormhole_transit_bytes_alltime

@@ -7,7 +7,6 @@ Use the following in /etc/munin/plugin-conf.d/wormhole :
 env.usagedb /path/to/your/wormhole/server/usage.sqlite
 """
 
-from __future__ import print_function
 import os, sys, time, sqlite3
 
 CONFIG = """\

misc/munin/wormhole_transit_events

@@ -7,7 +7,6 @@ Use the following in /etc/munin/plugin-conf.d/wormhole :
 env.usagedb /path/to/your/wormhole/server/usage.sqlite
 """
 
-from __future__ import print_function
 import os, sys, time, sqlite3
 
 CONFIG = """\

misc/munin/wormhole_transit_events_alltime

@@ -7,7 +7,6 @@ Use the following in /etc/munin/plugin-conf.d/wormhole :
 env.usagedb /path/to/your/wormhole/server/usage.sqlite
 """
 
-from __future__ import print_function
 import os, sys, time, sqlite3
 
 CONFIG = """\

src/wormhole_transit_relay/database.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import os
 import sqlite3
 import tempfile

src/wormhole_transit_relay/test/test_config.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals, print_function
 from twisted.trial import unittest
 from .. import server_tap
 

src/wormhole_transit_relay/test/test_database.py

@@ -1,4 +1,3 @@
-from __future__ import print_function, unicode_literals
 import os
 from twisted.python import filepath
 from twisted.trial import unittest

src/wormhole_transit_relay/test/test_rlimits.py

@@ -1,8 +1,4 @@
-from __future__ import print_function, unicode_literals
+from unittest import mock
-try:
-    from unittest import mock
-except ImportError:
-    import mock
 from twisted.trial import unittest
 from ..increase_rlimits import increase_rlimits
 

src/wormhole_transit_relay/test/test_service.py

@@ -1,9 +1,5 @@
-from __future__ import unicode_literals, print_function
 from twisted.trial import unittest
-try:
+from unittest import mock
-    from unittest import mock
-except ImportError:
-    import mock
 from twisted.application.service import MultiService
 from autobahn.twisted.websocket import WebSocketServerFactory
 from .. import server_tap

src/wormhole_transit_relay/test/test_stats.py

@@ -1,9 +1,5 @@
-from __future__ import print_function, unicode_literals
 import os, io, json
-try:
+from unittest import mock
-    from unittest import mock
-except ImportError:
-    import mock
 from twisted.trial import unittest
 from ..transit_server import Transit
 from ..usage import create_usage_tracker

src/wormhole_transit_relay/test/test_transit_server.py

@@ -1,4 +1,3 @@
-from __future__ import print_function, unicode_literals
 from binascii import hexlify
 from twisted.trial import unittest
 from twisted.test import iosim

src/wormhole_transit_relay/transit_server.py

@@ -1,4 +1,3 @@
-from __future__ import print_function, unicode_literals
 import re
 import time
 from twisted.python import log
@@ -69,10 +68,7 @@ class TransitConnection(LineReceiver):
         )
         self._state.connection_made(self)
 ##        self._log_requests = self.factory._log_requests
-        try:
+        self.transport.setTcpKeepAlive(True)
-            self.transport.setTcpKeepAlive(True)
-        except AttributeError:
-            pass
 
         # uncomment to turn on state-machine tracing
         # def tracer(oldstate, theinput, newstate):

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = {py27,py35,py36,py37,pypy}
+envlist = {py37,py38,py39,py310,pypy}
 skip_missing_interpreters = True
 minversion = 2.4.0