 |
Drop support for Python 2 - toot - Unnamed repository; edit this file 'descript… |
 |
Log |
|
Files |
|
Refs |
|
LICENSE |
|
--- |
|
commit 1b86cdd4047e294551cb58087bae0ac03d21a017 |
|
parent 38b6a475ca46765df7090bd923929932d39127d1 |
 |
Author: Ivan Habunek <[email protected]> |
|
Date: Tue, 12 Dec 2017 11:36:08 +0100 |
|
|
|
Drop support for Python 2 |
|
|
|
It's hard to maintain both versions, having unicode issues in py2, etc. |
|
|
|
Diffstat: |
|
.travis.yml | 1 - |
|
requirements.txt | 1 - |
|
setup.py | 3 --- |
|
toot/__init__.py | 2 -- |
|
toot/api.py | 2 +- |
|
toot/app.py | 2 -- |
|
toot/commands.py | 4 +--- |
|
toot/console.py | 3 --- |
|
toot/output.py | 3 --- |
|
toot/utils.py | 2 -- |
|
|
|
10 files changed, 2 insertions(+), 21 deletions(-) |
|
--- |
|
diff --git 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 |
|
@@ -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 |
|
@@ -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 |
|
@@ -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 |
|
@@ -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 |
|
@@ -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 |
|
@@ -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 |
|
@@ -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 |
|
@@ -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 |
|
@@ -1,6 +1,4 @@ |
|
# -*- coding: utf-8 -*- |
|
-from __future__ import unicode_literals |
|
-from __future__ import print_function |
|
|
|
import re |
|
