utilities/thefuck
SHA256
5
0
Fork 0
forked from pool/thefuck
Code Pull Requests Activity
Files
main
thefuck/drop-six.patch

391 lines
12 KiB
Diff
Raw Permalink Blame History

diff --git a/setup.py b/setup.py
index 36b13be..1c1c9a2 100755
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ elif (3, 0) < version < (3, 5):
VERSION = '3.32'
-install_requires = ['psutil', 'colorama', 'six', 'decorator', 'pyte']
+install_requires = ['psutil', 'colorama', 'decorator', 'pyte']
extras_require = {':python_version<"3.4"': ['pathlib2'],
':python_version<"3.3"': ['backports.shutil_get_terminal_size'],
':python_version<="2.7"': ['decorator<5'],
diff --git a/tests/entrypoints/test_alias.py b/tests/entrypoints/test_alias.py
index ddb13e1..977fc83 100644
--- a/tests/entrypoints/test_alias.py
+++ b/tests/entrypoints/test_alias.py
@@ -4,17 +4,15 @@ from thefuck.entrypoints.alias import _get_alias, print_alias
@pytest.mark.parametrize(
- 'py2, enable_experimental_instant_mode, which, is_instant', [
- (False, True, True, True),
- (False, False, True, False),
- (False, True, False, False),
- (True, True, True, False),
- (True, True, False, False),
- (True, False, True, False)])
-def test_get_alias(monkeypatch, mocker, py2,
+ 'enable_experimental_instant_mode, which, is_instant', [
+ (True, True, True),
+ (False, True, False),
+ (True, False, False),
+ (True, False, False),
+ (False, True, False)])
+def test_get_alias(monkeypatch, mocker,
enable_experimental_instant_mode,
which, is_instant):
- monkeypatch.setattr('six.PY2', py2)
args = Mock(
enable_experimental_instant_mode=enable_experimental_instant_mode,
alias='fuck', )
diff --git a/tests/entrypoints/test_not_configured.py b/tests/entrypoints/test_not_configured.py
index 79ed29f..d8ca5af 100644
--- a/tests/entrypoints/test_not_configured.py
+++ b/tests/entrypoints/test_not_configured.py
@@ -1,6 +1,6 @@
import pytest
import json
-from six import StringIO
+from io import StringIO
from mock import MagicMock
from thefuck.shells.generic import ShellConfiguration
from thefuck.entrypoints.not_configured import main
diff --git a/tests/rules/test_gem_unknown_command.py b/tests/rules/test_gem_unknown_command.py
index 3da0fa7..ffa3867 100644
--- a/tests/rules/test_gem_unknown_command.py
+++ b/tests/rules/test_gem_unknown_command.py
@@ -1,5 +1,5 @@
import pytest
-from six import BytesIO
+from io import BytesIO
from thefuck.rules.gem_unknown_command import match, get_new_command
from thefuck.types import Command
diff --git a/tests/rules/test_ifconfig_device_not_found.py b/tests/rules/test_ifconfig_device_not_found.py
index 09d20b1..645e718 100644
--- a/tests/rules/test_ifconfig_device_not_found.py
+++ b/tests/rules/test_ifconfig_device_not_found.py
@@ -1,5 +1,5 @@
import pytest
-from six import BytesIO
+from io import BytesIO
from thefuck.rules.ifconfig_device_not_found import match, get_new_command
from thefuck.types import Command
diff --git a/tests/shells/conftest.py b/tests/shells/conftest.py
index 069673f..5592f28 100644
--- a/tests/shells/conftest.py
+++ b/tests/shells/conftest.py
@@ -3,7 +3,7 @@ import pytest
@pytest.fixture
def builtins_open(mocker):
- return mocker.patch('six.moves.builtins.open')
+ return mocker.patch('builtins.open')
@pytest.fixture
diff --git a/tests/test_conf.py b/tests/test_conf.py
index e03473a..d99a7c8 100644
--- a/tests/test_conf.py
+++ b/tests/test_conf.py
@@ -1,5 +1,5 @@
import pytest
-import six
+import io
import os
from mock import Mock
from thefuck import const
@@ -90,7 +90,7 @@ class TestInitializeSettingsFile(object):
assert not settings_path_mock.open.called
def test_create_if_doesnt_exists(self, settings):
- settings_file = six.StringIO()
+ settings_file = io.StringIO()
settings_path_mock = Mock(
is_file=Mock(return_value=False),
open=Mock(return_value=Mock(
diff --git a/thefuck/conf.py b/thefuck/conf.py
index 27876ef..344384c 100644
--- a/thefuck/conf.py
+++ b/thefuck/conf.py
@@ -2,7 +2,6 @@ from imp import load_source
import os
import sys
from warnings import warn
-from six import text_type
from . import const
from .system import Path
@@ -67,7 +66,7 @@ class Settings(dict):
def _settings_from_file(self):
"""Loads settings from file."""
settings = load_source(
- 'settings', text_type(self.user_dir.joinpath('settings.py')))
+ 'settings', str(self.user_dir.joinpath('settings.py')))
return {key: getattr(settings, key)
for key in const.DEFAULT_SETTINGS.keys()
if hasattr(settings, key)}
diff --git a/thefuck/entrypoints/alias.py b/thefuck/entrypoints/alias.py
index c7094d4..3fe8650 100644
--- a/thefuck/entrypoints/alias.py
+++ b/thefuck/entrypoints/alias.py
@@ -1,4 +1,3 @@
-import six
from ..conf import settings
from ..logs import warn
from ..shells import shell
@@ -6,16 +5,11 @@ from ..utils import which
def _get_alias(known_args):
- if six.PY2:
- warn("The Fuck will drop Python 2 support soon, more details "
- "https://github.com/nvbn/thefuck/issues/685")
alias = shell.app_alias(known_args.alias)
if known_args.enable_experimental_instant_mode:
- if six.PY2:
- warn("Instant mode requires Python 3")
- elif not which('script'):
+ if not which('script'):
warn("Instant mode requires `script` app")
else:
return shell.instant_mode_alias(known_args.alias)
diff --git a/thefuck/entrypoints/not_configured.py b/thefuck/entrypoints/not_configured.py
index f5d7e85..1a1ba1e 100644
--- a/thefuck/entrypoints/not_configured.py
+++ b/thefuck/entrypoints/not_configured.py
@@ -8,7 +8,6 @@ import os # noqa: E402
import json # noqa: E402
from tempfile import gettempdir # noqa: E402
import time # noqa: E402
-import six # noqa: E402
from psutil import Process # noqa: E402
from .. import logs, const # noqa: E402
from ..shells import shell # noqa: E402
@@ -38,7 +37,7 @@ def _record_first_run():
info = {'pid': _get_shell_pid(),
'time': time.time()}
- mode = 'wb' if six.PY2 else 'w'
+ mode = 'w'
with _get_not_configured_usage_tracker_path().open(mode) as tracker:
json.dump(info, tracker)
diff --git a/thefuck/output_readers/read_log.py b/thefuck/output_readers/read_log.py
index 0224a0d..4c21787 100644
--- a/thefuck/output_readers/read_log.py
+++ b/thefuck/output_readers/read_log.py
@@ -6,7 +6,6 @@ try:
from shutil import get_terminal_size
except ImportError:
from backports.shutil_get_terminal_size import get_terminal_size
-import six
import pyte
from ..exceptions import ScriptNotInLog
from .. import const, logs
@@ -40,8 +39,6 @@ def _group_by_calls(log):
def _get_script_group_lines(grouped, script):
- if six.PY2:
- script = script.encode('utf-8')
parts = shlex.split(script)
@@ -77,9 +74,6 @@ def get_output(script):
:rtype: str | None
"""
- if six.PY2:
- logs.warn('Experimental instant mode is Python 3+ only')
- return None
if 'THEFUCK_OUTPUT_LOG' not in os.environ:
logs.warn("Output log isn't specified")
diff --git a/thefuck/output_readers/rerun.py b/thefuck/output_readers/rerun.py
index b7ffe24..af6c8ce 100644
--- a/thefuck/output_readers/rerun.py
+++ b/thefuck/output_readers/rerun.py
@@ -1,6 +1,5 @@
import os
import shlex
-import six
from subprocess import Popen, PIPE, STDOUT
from psutil import AccessDenied, Process, TimeoutExpired
from .. import logs
@@ -54,8 +53,6 @@ def get_output(script, expanded):
env = dict(os.environ)
env.update(settings.env)
- if six.PY2:
- expanded = expanded.encode('utf-8')
split_expand = shlex.split(expanded)
is_slow = split_expand[0] in settings.slow_commands if split_expand else False
diff --git a/thefuck/rules/cd_correction.py b/thefuck/rules/cd_correction.py
index dc45636..204af26 100644
--- a/thefuck/rules/cd_correction.py
+++ b/thefuck/rules/cd_correction.py
@@ -1,7 +1,6 @@
"""Attempts to spellcheck and correct failed cd commands"""
import os
-import six
from thefuck.specific.sudo import sudo_support
from thefuck.rules import cd_mkdir
from thefuck.utils import for_app, get_close_matches
@@ -43,8 +42,6 @@ def get_new_command(command):
if dest[0] == '':
cwd = os.sep
dest = dest[1:]
- elif six.PY2:
- cwd = os.getcwdu()
else:
cwd = os.getcwd()
for directory in dest:
diff --git a/thefuck/rules/whois.py b/thefuck/rules/whois.py
index c16bd70..eb718ff 100644
--- a/thefuck/rules/whois.py
+++ b/thefuck/rules/whois.py
@@ -1,5 +1,5 @@
# -*- encoding: utf-8 -*-
-from six.moves.urllib.parse import urlparse
+from urllib.parse import urlparse
from thefuck.utils import for_app
diff --git a/thefuck/shells/fish.py b/thefuck/shells/fish.py
index eb7e915..2801214 100644
--- a/thefuck/shells/fish.py
+++ b/thefuck/shells/fish.py
@@ -2,7 +2,6 @@ from subprocess import Popen, PIPE
from time import time
import os
import sys
-import six
from .. import logs
from ..conf import settings
from ..const import ARGUMENT_PLACEHOLDER
@@ -123,7 +122,4 @@ class Fish(Generic):
if os.path.isfile(history_file_name):
with open(history_file_name, 'a') as history:
entry = self._get_history_line(command_script)
- if six.PY2:
- history.write(entry.encode('utf-8'))
- else:
- history.write(entry)
+ history.write(entry)
diff --git a/thefuck/shells/generic.py b/thefuck/shells/generic.py
index aa81e2a..e458a6f 100644
--- a/thefuck/shells/generic.py
+++ b/thefuck/shells/generic.py
@@ -1,7 +1,6 @@
import io
import os
import shlex
-import six
from collections import namedtuple
from ..logs import warn
from ..utils import memoize
@@ -91,22 +90,15 @@ class Generic(object):
return self.decode_utf8(splitted)
def encode_utf8(self, command):
- if six.PY2:
- return command.encode('utf8')
return command
def decode_utf8(self, command_parts):
- if six.PY2:
- return [s.decode('utf8') for s in command_parts]
return command_parts
def quote(self, s):
"""Return a shell-escaped version of the string s."""
- if six.PY2:
- from pipes import quote
- else:
- from shlex import quote
+ from shlex import quote
return quote(s)
diff --git a/thefuck/specific/sudo.py b/thefuck/specific/sudo.py
index ddc6d40..c00a35b 100644
--- a/thefuck/specific/sudo.py
+++ b/thefuck/specific/sudo.py
@@ -1,4 +1,3 @@
-import six
from decorator import decorator
@@ -10,7 +9,7 @@ def sudo_support(fn, command):
result = fn(command.update(script=command.script[5:]))
- if result and isinstance(result, six.string_types):
+ if result and isinstance(result, str):
return u'sudo {}'.format(result)
elif isinstance(result, list):
return [u'sudo {}'.format(x) for x in result]
diff --git a/thefuck/utils.py b/thefuck/utils.py
index 466e4ba..05d145c 100644
--- a/thefuck/utils.py
+++ b/thefuck/utils.py
@@ -4,7 +4,6 @@ import pickle
import re
import shelve
import sys
-import six
from decorator import decorator
from difflib import get_close_matches as difflib_get_close_matches
from functools import wraps
@@ -14,12 +13,8 @@ from .system import Path
DEVNULL = open(os.devnull, 'w')
-if six.PY2:
- import anydbm
- shelve_open_error = anydbm.error
-else:
- import dbm
- shelve_open_error = dbm.error
+import dbm
+shelve_open_error = dbm.error
def memoize(fn):
@@ -121,13 +116,13 @@ def get_all_executables():
tf_alias = get_alias()
tf_entry_points = ['thefuck', 'fuck']
- bins = [exe.name.decode('utf8') if six.PY2 else exe.name
+ bins = [exe.name
for path in os.environ.get('PATH', '').split(os.pathsep)
if include_path_in_search(path)
for exe in _safe(lambda: list(Path(path).iterdir()), [])
if not _safe(exe.is_dir, True)
and exe.name not in tf_entry_points]
- aliases = [alias.decode('utf8') if six.PY2 else alias
+ aliases = [alias
for alias in shell.get_aliases() if alias != tf_alias]
return bins + aliases
@@ -339,9 +334,6 @@ def format_raw_script(raw_script):
:rtype: basestring
"""
- if six.PY2:
- script = ' '.join(arg.decode('utf-8') for arg in raw_script)
- else:
- script = ' '.join(raw_script)
+ script = ' '.join(raw_script)
return script.lstrip()
View Git Blame Copy Permalink