Skip to content

Commit 14f80f8

Browse files
author
zer0def
committed
Drop python-future as all dependent py-vers are EOL
1 parent feae9fd commit 14f80f8

File tree

16 files changed

+9
-31
lines changed

16 files changed

+9
-31
lines changed

main.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
1616
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1717

18-
from __future__ import unicode_literals
19-
2018
import os
2119

2220
# See if there is a `venv` directory next to our script, and use that if
@@ -41,7 +39,6 @@
4139
import logbook
4240
import json
4341
import OpenSSL.crypto as crypto
44-
from future.utils import bytes_to_native_str as n
4542
from logbook import Logger, StreamHandler
4643

4744
try:
@@ -96,7 +93,7 @@
9693
matrix_config_server_write_cb, matrix_timer_cb,
9794
send_cb, matrix_load_users_cb)
9895
from matrix.utf import utf8_decode
99-
from matrix.utils import server_buffer_prnt, server_buffer_set_title
96+
from matrix.utils import server_buffer_prnt, server_buffer_set_title, bytes_to_native_str as n
10097

10198
from matrix.uploads import UploadsBuffer, upload_cb
10299

matrix/bar_items.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
1515
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1616

17-
from __future__ import unicode_literals
18-
1917
from . import globals as G
2018
from .globals import SERVERS, W
2119
from .utf import utf8_decode

matrix/buffer.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
1616
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1717

18-
from __future__ import unicode_literals
19-
2018
import time
2119
import attr
2220
import pprint

matrix/colors.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
1818
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1919

20-
from __future__ import unicode_literals
21-
2220
import html
2321
import re
2422
import textwrap

matrix/commands.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515
# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
1616
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1717

18-
from __future__ import unicode_literals
1918
import argparse
2019
import os
2120
import re
2221
import shlex
2322
from builtins import str
24-
from future.moves.itertools import zip_longest
2523
from collections import defaultdict
2624
from functools import partial
25+
from itertools import zip_longest
2726
from nio import EncryptionError, LocalProtocolError
2827

2928
from . import globals as G

matrix/completion.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
1515
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1616

17-
from __future__ import unicode_literals
18-
1917
from typing import List, Optional
2018
from matrix.globals import SERVERS, W, SCRIPT_NAME
2119
from matrix.utf import utf8_decode

matrix/globals.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
1515
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1616

17-
from __future__ import unicode_literals
18-
1917
import sys
2018
from typing import Any, Dict, Optional
2119
from logbook import Logger

matrix/message_renderer.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
"""Module for rendering matrix messages in Weechat."""
1919

20-
from __future__ import unicode_literals
2120
from nio import Api
2221
from .globals import W
2322
from .colors import Formatted

matrix/server.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
1515
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1616

17-
from __future__ import unicode_literals
18-
1917
import os
2018
import pprint
2119
import socket

matrix/uploads.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
"""Module implementing upload functionality."""
1818

19-
from __future__ import unicode_literals
20-
2119
import attr
2220
import time
2321
import json

0 commit comments

Comments
 (0)