diff --git a/.travis.yml b/.travis.yml index 0155e18..f058d05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: python python: - - "2.7" - "3.3" - "3.4" - "3.5" diff --git a/requirements.txt b/requirements.txt index a0b3e4f..b2b6258 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ requests>=2.13,<3.0 beautifulsoup4>=4.5.0,<5.0 -future>=0.16 diff --git a/setup.py b/setup.py index ba84e19..a799f69 100644 --- a/setup.py +++ b/setup.py @@ -18,8 +18,6 @@ setup( classifiers=[ 'Development Status :: 4 - Beta', 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', @@ -30,7 +28,6 @@ setup( install_requires=[ "requests>=2.13,<3.0", "beautifulsoup4>=4.5.0,<5.0", - "future>=0.16", ], entry_points={ 'console_scripts': [ diff --git a/toot/__init__.py b/toot/__init__.py index 4e55f4d..2ac3c92 100644 --- a/toot/__init__.py +++ b/toot/__init__.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals -from __future__ import print_function from collections import namedtuple diff --git a/toot/api.py b/toot/api.py index b1dfc42..72491c0 100644 --- a/toot/api.py +++ b/toot/api.py @@ -4,7 +4,7 @@ import logging import re import requests -from future.moves.urllib.parse import urlparse, urlencode +from urllib.parse import urlparse, urlencode from requests import Request, Session from toot import CLIENT_NAME, CLIENT_WEBSITE diff --git a/toot/app.py b/toot/app.py index 74fa6b0..550670c 100644 --- a/toot/app.py +++ b/toot/app.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals -from __future__ import print_function import webbrowser diff --git a/toot/commands.py b/toot/commands.py index 3b451ad..19b4135 100644 --- a/toot/commands.py +++ b/toot/commands.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals -from __future__ import print_function import json import requests @@ -9,7 +7,7 @@ import webbrowser from bs4 import BeautifulSoup from builtins import input from datetime import datetime -from future.moves.itertools import zip_longest +from itertools import zip_longest from getpass import getpass from itertools import chain from textwrap import TextWrapper, wrap diff --git a/toot/console.py b/toot/console.py index 6041235..1ae8232 100644 --- a/toot/console.py +++ b/toot/console.py @@ -1,8 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals -from __future__ import print_function -import os import sys import logging diff --git a/toot/output.py b/toot/output.py index 0e836d5..0c1590c 100644 --- a/toot/output.py +++ b/toot/output.py @@ -1,11 +1,8 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals -from __future__ import print_function import sys import re - START_CODES = { 'red': '\033[31m', 'green': '\033[32m', diff --git a/toot/utils.py b/toot/utils.py index 1b89067..2ce04a6 100644 --- a/toot/utils.py +++ b/toot/utils.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals -from __future__ import print_function import re