Skip to content

Commit f25e27e

Browse files
committed
Merge branch 'refs/heads/testing'
2 parents 58663a7 + cb1cf72 commit f25e27e

210 files changed

Lines changed: 12788 additions & 398 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

SublimePython.sublime-commands

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
[
23
{
34
"caption": "Python: Go to definition",
@@ -18,5 +19,17 @@
1819
{
1920
"caption": "Python: Disable Pep8 Linting On View",
2021
"command": "python_disable_pep8"
21-
}
22+
},
23+
{
24+
"caption": "Python Refactor: Rename",
25+
"command": "python_refactor_rename"
26+
},
27+
{
28+
"caption": "Python Refactor: Extract Method",
29+
"command": "python_extract_method"
30+
},
31+
{
32+
"caption": "Python Refactor: Organize Imports",
33+
"command": "python_organize_imports"
34+
},
2235
]

SublimePython.sublime-settings

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,8 @@
3030
"pep8": true,
3131
"pep8_ignore": [],
3232
"pep8_max_line_length": 80,
33-
"pyflakes_ignore": []
33+
"pyflakes_ignore": [],
34+
35+
// If the organize imports refactoring should be called on every file save
36+
"python_organize_imports_on_save": false
3437
}

__init__.py

Whitespace-only changes.
File renamed without changes.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import _ast
99
from optparse import OptionParser
1010

11-
from pyflakes import checker, __version__
12-
from pyflakes import reporter as modReporter
11+
from SublimePythonIDE.pyflakes import checker, __version__
12+
from SublimePythonIDE.pyflakes import reporter as modReporter
1313

1414
__all__ = ['check', 'checkPath', 'checkRecursive', 'iterSourceCode', 'main']
1515

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def iter_child_nodes(node):
4545
ast_TryExcept = ast.TryExcept
4646
ast_TryFinally = ast.TryFinally
4747

48-
from pyflakes import messages
48+
from SublimePythonIDE.pyflakes import messages
4949

5050

5151
if PY2:

0 commit comments

Comments
 (0)