mirror of
				https://github.com/nvbn/thefuck.git
				synced 2025-10-30 22:54:14 +00:00 
			
		
		
		
	Fix some pep8 issues, mostly spaces
Before:
    4       E101 indentation contains mixed spaces and tabs
    20      E122 continuation line missing indentation or outdented
    1       E124 closing bracket does not match visual indentation
    12      E127 continuation line over-indented for visual indent
    22      E128 continuation line under-indented for visual indent
    2       E211 whitespace before '('
    12      E302 expected 2 blank lines, found 1
    1       E303 too many blank lines (3)
    4       E402 module level import not at top of file
    123     E501 line too long (81 > 79 characters)
    2       E731 do not assign a lambda expression, use a def
    3       W191 indentation contains tabs
    20      W291 trailing whitespace
    3       W293 blank line contains whitespace
    2       W391 blank line at end of file
    69      W503 line break before binary operator
After:
    20      E122 continuation line missing indentation or outdented
    12      E127 continuation line over-indented for visual indent
    22      E128 continuation line under-indented for visual indent
    123     E501 line too long (81 > 79 characters)
    2       E731 do not assign a lambda expression, use a def
    1       W291 trailing whitespace
    68      W503 line break before binary operator
			
			
This commit is contained in:
		| @@ -5,34 +5,38 @@ from tests.utils import Command | ||||
|  | ||||
| @pytest.fixture | ||||
| def composer_not_command(): | ||||
|     return """ | ||||
|  | ||||
|                                      | ||||
|   [InvalidArgumentException]         | ||||
|   Command "udpate" is not defined.   | ||||
|   Did you mean this?                 | ||||
|       update | ||||
|  | ||||
|  | ||||
| """ | ||||
|     # that weird spacing is part of the actual command output | ||||
|     return ( | ||||
|         '\n' | ||||
|         '\n' | ||||
|         '                                    \n' | ||||
|         '  [InvalidArgumentException]        \n' | ||||
|         '  Command "udpate" is not defined.  \n' | ||||
|         '  Did you mean this?                \n' | ||||
|         '      update                        \n' | ||||
|         '                                    \n' | ||||
|         '\n' | ||||
|         '\n' | ||||
|     ) | ||||
|  | ||||
|  | ||||
| @pytest.fixture | ||||
| def composer_not_command_one_of_this(): | ||||
|     return """ | ||||
|                              | ||||
|  | ||||
|  | ||||
|   [InvalidArgumentException]        | ||||
|   Command "pdate" is not defined.   | ||||
|   Did you mean one of these?        | ||||
|       selfupdate                    | ||||
|       self-update                   | ||||
|       update                        | ||||
|  | ||||
|  | ||||
|  | ||||
| """ | ||||
|     # that weird spacing is part of the actual command output | ||||
|     return ( | ||||
|         '\n' | ||||
|         '\n' | ||||
|         '                                   \n' | ||||
|         '  [InvalidArgumentException]       \n' | ||||
|         '  Command "pdate" is not defined.  \n' | ||||
|         '  Did you mean one of these?       \n' | ||||
|         '      selfupdate                   \n' | ||||
|         '      self-update                  \n' | ||||
|         '      update                       \n' | ||||
|         '                                   \n' | ||||
|         '\n' | ||||
|         '\n' | ||||
|     ) | ||||
|  | ||||
|  | ||||
| def test_match(composer_not_command, composer_not_command_one_of_this): | ||||
|   | ||||
| @@ -40,6 +40,7 @@ parametrize_script = pytest.mark.parametrize('script, fixed', [ | ||||
|     ('tar -xvf {}', 'mkdir -p foo && tar -xvf {} -C foo'), | ||||
|     ('tar --extract -f {}', 'mkdir -p foo && tar --extract -f {} -C foo')]) | ||||
|  | ||||
|  | ||||
| @parametrize_filename | ||||
| @parametrize_script | ||||
| def test_match(tar_error, filename, script, fixed): | ||||
|   | ||||
| @@ -85,8 +85,7 @@ Traceback (most recent call last): | ||||
|   File "/usr/lib/python3.4/re.py", line 293, in _compile | ||||
|     raise TypeError("first argument must be string or compiled pattern") | ||||
| TypeError: first argument must be string or compiled pattern | ||||
| """ | ||||
| ), | ||||
| """), | ||||
|  | ||||
| ('ruby a.rb', 'a.rb', 3, None, | ||||
| """ | ||||
|   | ||||
| @@ -2,6 +2,7 @@ from thefuck import shells | ||||
| from thefuck.rules.git_branch_list import match, get_new_command | ||||
| from tests.utils import Command | ||||
|  | ||||
|  | ||||
| def test_match(): | ||||
|     assert match(Command('git branch list'), None) | ||||
|  | ||||
|   | ||||
| @@ -10,7 +10,7 @@ usage: git stash list [<options>] | ||||
|    or: git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>] | ||||
|    or: git stash branch <branchname> [<stash>] | ||||
|    or: git stash [save [--patch] [-k|--[no-]keep-index] [-q|--quiet] | ||||
| 		       [-u|--include-untracked] [-a|--all] [<message>]] | ||||
| \t\t       [-u|--include-untracked] [-a|--all] [<message>]] | ||||
|    or: git stash clear | ||||
| ''' | ||||
|  | ||||
|   | ||||
| @@ -30,8 +30,8 @@ def git_not_command_closest(): | ||||
|     return '''git: 'tags' is not a git command. See 'git --help'. | ||||
|  | ||||
| Did you mean one of these? | ||||
| 	stage | ||||
| 	tag | ||||
| \tstage | ||||
| \ttag | ||||
| ''' | ||||
|  | ||||
|  | ||||
|   | ||||
| @@ -4,7 +4,7 @@ from tests.utils import Command | ||||
|  | ||||
|  | ||||
| @pytest.mark.parametrize('command', [ | ||||
|     Command(script='go run foo'),  | ||||
|     Command(script='go run foo'), | ||||
|     Command(script='go run bar')]) | ||||
| def test_match(command): | ||||
|     assert match(command, None) | ||||
|   | ||||
| @@ -3,7 +3,6 @@ from thefuck.rules.systemctl import match, get_new_command | ||||
| from tests.utils import Command | ||||
|  | ||||
|  | ||||
|  | ||||
| def test_match(): | ||||
|     assert match(Command('systemctl nginx start', stderr='Unknown operation \'nginx\'.'), None) | ||||
|     assert match(Command('sudo systemctl nginx start', stderr='Unknown operation \'nginx\'.'), None) | ||||
| @@ -13,6 +12,7 @@ def test_match(): | ||||
|     assert not match(Command('systemctl nginx', stderr='Unknown operation \'nginx\'.'), None) | ||||
|     assert not match(Command('systemctl start wtf', stderr='Failed to start wtf.service: Unit wtf.service failed to load: No such file or directory.'), None) | ||||
|  | ||||
|  | ||||
| def test_get_new_command(): | ||||
|     assert get_new_command(Command('systemctl nginx start'), None) == "systemctl start nginx" | ||||
|     assert get_new_command(Command('sudo systemctl nginx start'), None) == "sudo systemctl start nginx" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user