diff --git a/misc/migrate_usage_db.py b/misc/migrate_usage_db.py index 6530d40..6f7a59d 100644 --- a/misc/migrate_usage_db.py +++ b/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 diff --git a/misc/munin/wormhole_transit_active b/misc/munin/wormhole_transit_active index b1c0650..6e3f993 100755 --- a/misc/munin/wormhole_transit_active +++ b/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 = """\ diff --git a/misc/munin/wormhole_transit_bytes b/misc/munin/wormhole_transit_bytes index 0cfb7a8..e2d7ca2 100755 --- a/misc/munin/wormhole_transit_bytes +++ b/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 = """\ diff --git a/misc/munin/wormhole_transit_bytes_alltime b/misc/munin/wormhole_transit_bytes_alltime index fba0208..3c29398 100755 --- a/misc/munin/wormhole_transit_bytes_alltime +++ b/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 = """\ diff --git a/misc/munin/wormhole_transit_events b/misc/munin/wormhole_transit_events index 429e17e..148f970 100755 --- a/misc/munin/wormhole_transit_events +++ b/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 = """\ diff --git a/misc/munin/wormhole_transit_events_alltime b/misc/munin/wormhole_transit_events_alltime index 46b8050..ffd31c4 100755 --- a/misc/munin/wormhole_transit_events_alltime +++ b/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 = """\ diff --git a/src/wormhole_transit_relay/database.py b/src/wormhole_transit_relay/database.py index 7fe6408..3b1803b 100644 --- a/src/wormhole_transit_relay/database.py +++ b/src/wormhole_transit_relay/database.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals import os import sqlite3 import tempfile diff --git a/src/wormhole_transit_relay/test/test_config.py b/src/wormhole_transit_relay/test/test_config.py index 72aa7ec..b27ffd5 100644 --- a/src/wormhole_transit_relay/test/test_config.py +++ b/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 diff --git a/src/wormhole_transit_relay/test/test_database.py b/src/wormhole_transit_relay/test/test_database.py index fb3d4ff..ad070b3 100644 --- a/src/wormhole_transit_relay/test/test_database.py +++ b/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 diff --git a/src/wormhole_transit_relay/test/test_rlimits.py b/src/wormhole_transit_relay/test/test_rlimits.py index 3ee23a9..56cd0cd 100644 --- a/src/wormhole_transit_relay/test/test_rlimits.py +++ b/src/wormhole_transit_relay/test/test_rlimits.py @@ -1,4 +1,3 @@ -from __future__ import print_function, unicode_literals from unittest import mock from twisted.trial import unittest from ..increase_rlimits import increase_rlimits diff --git a/src/wormhole_transit_relay/test/test_service.py b/src/wormhole_transit_relay/test/test_service.py index f72765c..1532f56 100644 --- a/src/wormhole_transit_relay/test/test_service.py +++ b/src/wormhole_transit_relay/test/test_service.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals, print_function from twisted.trial import unittest from unittest import mock from twisted.application.service import MultiService diff --git a/src/wormhole_transit_relay/test/test_stats.py b/src/wormhole_transit_relay/test/test_stats.py index 43b912f..be17d91 100644 --- a/src/wormhole_transit_relay/test/test_stats.py +++ b/src/wormhole_transit_relay/test/test_stats.py @@ -1,4 +1,3 @@ -from __future__ import print_function, unicode_literals import os, io, json, sqlite3 from unittest import mock from twisted.trial import unittest diff --git a/src/wormhole_transit_relay/test/test_transit_server.py b/src/wormhole_transit_relay/test/test_transit_server.py index bca740e..fddbe14 100644 --- a/src/wormhole_transit_relay/test/test_transit_server.py +++ b/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 .common import ServerBase diff --git a/src/wormhole_transit_relay/transit_server.py b/src/wormhole_transit_relay/transit_server.py index 567fbd9..8b4fbf9 100644 --- a/src/wormhole_transit_relay/transit_server.py +++ b/src/wormhole_transit_relay/transit_server.py @@ -1,4 +1,3 @@ -from __future__ import print_function, unicode_literals import re, time, json from collections import defaultdict from twisted.python import log