diff --git a/src/chrome/komodo/content/library/test/test_pylint.jsm b/src/chrome/komodo/content/library/test/test_pylint.jsm
index 5c00978e82..4d3328a5fa 100644
--- a/src/chrome/komodo/content/library/test/test_pylint.jsm
+++ b/src/chrome/komodo/content/library/test/test_pylint.jsm
@@ -37,10 +37,10 @@ TestPylint.prototype.setUp = function TestPylint_setUp() {
lint_python_with_standard_python: this.globalPrefs.getBooleanPref("lint_python_with_standard_python"),
lint_python3_with_standard_python: this.globalPrefs.getBooleanPref("lint_python3_with_standard_python"),
lint_python_with_pyflakes: this.globalPrefs.getBooleanPref("lint_python_with_pyflakes"),
- lint_python_with_pep8: this.globalPrefs.getBooleanPref("lint_python_with_pep8"),
+ lint_python_with_pycodestyle: this.globalPrefs.getBooleanPref("lint_python_with_pycodestyle"),
lint_python_with_pychecker: this.globalPrefs.getBooleanPref("lint_python_with_pychecker"),
lint_python3_with_pyflakes3: this.globalPrefs.getBooleanPref("lint_python3_with_pyflakes3"),
- lint_python3_with_pep83: this.globalPrefs.getBooleanPref("lint_python3_with_pep83"),
+ lint_python3_with_pycodestyle3: this.globalPrefs.getBooleanPref("lint_python3_with_pycodestyle3"),
lint_python3_with_pychecker3: this.globalPrefs.getBooleanPref("lint_python3_with_pychecker3")
};
this.origStringPrefs = {
diff --git a/src/chrome/komodo/content/lint/lint.js b/src/chrome/komodo/content/lint/lint.js
index a4ba7bfabc..51332a6fa9 100644
--- a/src/chrome/komodo/content/lint/lint.js
+++ b/src/chrome/komodo/content/lint/lint.js
@@ -113,16 +113,16 @@ var global_pref_observer_topics = {
"pythonDefaultInterpreter" : PYTHON_LIST,
"python3DefaultInterpreter" : PYTHON3_LIST,
"lint_python_with_pylint" : PYTHON_LIST,
- "lint_python_with_pep8" : PYTHON_LIST,
+ "lint_python_with_pycodestyle" : PYTHON_LIST,
"lint_python_with_pyflakes" : PYTHON_LIST,
"lint_python_with_standard_python" : PYTHON_LIST,
"lint_python3_with_standard_python" : PYTHON3_LIST,
"lint_python3_with_pylint3" : PYTHON3_LIST,
- "lint_python3_with_pep83" : PYTHON3_LIST,
+ "lint_python3_with_pycodestyle3" : PYTHON3_LIST,
"lint_python3_with_pyflakes3" : PYTHON3_LIST,
"pylint_checking_rcfile" : PYTHON_LIST,
- "pep8_checking_rcfile" : PYTHON_LIST,
- "pep83_checking_rcfile" : PYTHON3_LIST,
+ "pycodestyle_checking_rcfile" : PYTHON_LIST,
+ "pycodestyle3_checking_rcfile" : PYTHON3_LIST,
"lint_python_with_pychecker" : PYTHON_LIST,
"pychecker_checking_rcfile" : PYTHON_LIST,
"phpDefaultInterpreter" : PHP_LIST,
diff --git a/src/chrome/komodo/content/pref/pref-syntax-checking.js b/src/chrome/komodo/content/pref/pref-syntax-checking.js
index b0a2be9ca9..3445e5bdfe 100644
--- a/src/chrome/komodo/content/pref/pref-syntax-checking.js
+++ b/src/chrome/komodo/content/pref/pref-syntax-checking.js
@@ -640,7 +640,7 @@ function python_setup() {
dialog.Python = {};
[
"lint_python_with_pychecker",
- "lint_python_with_pep8",
+ "lint_python_with_pycodestyle",
"lint_python_with_pylint",
"lint_python_with_pyflakes",
"pychecker_browse_rcfile",
@@ -655,10 +655,10 @@ function python_setup() {
"pylint_checking_rcfile",
"pylint_failure",
"pylint_checking_vbox_rcfile",
- "pep8_browse_rcfile",
- "pep8_checking_rcfile",
- "pep8_failure",
- "pep8_checking_vbox_rcfile",
+ "pycodestyle_browse_rcfile",
+ "pycodestyle_checking_rcfile",
+ "pycodestyle_failure",
+ "pycodestyle_checking_vbox_rcfile",
"python_lintOption"
].forEach(function(name) {
dialog.Python[name] = document.getElementById(name);
@@ -669,10 +669,10 @@ function python_setup() {
getService(Components.interfaces.koIAppInfoEx);
var pythonExe = appInfoEx.executablePath;
var pylintStatusByExecutable = languageInfo.Python.pylintStatusByExecutable;
- var pep8StatusByExecutable = languageInfo.Python.pep8StatusByExecutable;
+ var pycodestyleStatusByExecutable = languageInfo.Python.pycodestyleStatusByExecutable;
var pyflakesStatusByExecutable = languageInfo.Python.pyflakesStatusByExecutable;
if (!(pythonExe in pylintStatusByExecutable)
- || !(pythonExe in pep8StatusByExecutable)
+ || !(pythonExe in pycodestyleStatusByExecutable)
|| !(pythonExe in pyflakesStatusByExecutable)) {
setTimeout(function() {
var res;
@@ -681,8 +681,8 @@ function python_setup() {
res = appInfoEx.haveModules(1, ['pylint']);
pylintStatusByExecutable[pythonExe] = res;
}
- if (!(pythonExe in pep8StatusByExecutable)) {
- pep8StatusByExecutable[pythonExe] = appInfoEx.haveModules(1, ['pep8']);
+ if (!(pythonExe in pycodestyleStatusByExecutable)) {
+ pycodestyleStatusByExecutable[pythonExe] = appInfoEx.haveModules(1, ['pycodestyle']);
}
if (!(pythonExe in pyflakesStatusByExecutable)) {
res = null;
@@ -709,7 +709,7 @@ languageSetup.Python = python_setup;
function pythonInfo() {
return {
pylintStatusByExecutable: {},
- pep8StatusByExecutable: {},
+ pycodestyleStatusByExecutable: {},
pyflakesStatusByExecutable: {},
_updateFailureBox: function(failureNode, pythonExe, linterName) {
@@ -740,18 +740,18 @@ function pythonInfo() {
}
this.onTogglePylintChecking(checkbox);
- // pep8
- var checkbox = dialog.Python.lint_python_with_pep8;
- var failureNode = dialog.Python.pep8_failure;
- if (pythonExe && this.pep8StatusByExecutable[pythonExe]) {
+ // pycodestyle
+ var checkbox = dialog.Python.lint_python_with_pycodestyle;
+ var failureNode = dialog.Python.pycodestyle_failure;
+ if (pythonExe && this.pycodestyleStatusByExecutable[pythonExe]) {
failureNode.setAttribute("class", "pref_hide");
checkbox.disabled = false;
} else {
checkbox.checked = false;
checkbox.disabled = true;
- this._updateFailureBox(failureNode, pythonExe, "pep8");
+ this._updateFailureBox(failureNode, pythonExe, "pycodestyle");
}
- this.onTogglePep8Checking(checkbox);
+ this.onTogglePycodestyleChecking(checkbox);
// pyflakes
checkbox = dialog.Python.lint_python_with_pyflakes;
@@ -782,8 +782,8 @@ function pythonInfo() {
dialog.Python.pylint_checking_vbox_rcfile.collapsed = !checkbox.checked;
},
- onTogglePep8Checking: function(checkbox) {
- dialog.Python.pep8_checking_vbox_rcfile.collapsed = !checkbox.checked;
+ onTogglePycodestyleChecking: function(checkbox) {
+ dialog.Python.pycodestyle_checking_vbox_rcfile.collapsed = !checkbox.checked;
},
onTogglePycheckerChecking: function(checkbox) {
@@ -821,9 +821,9 @@ function pythonInfo() {
"Find a .pylintrc file");
},
- loadPep8Rcfile: function() {
- this.loadTextboxFromFilepicker("pep8_checking_rcfile",
- "Find a pep8 config file");
+ loadPycodestyleRcfile: function() {
+ this.loadTextboxFromFilepicker("pycodestyle_checking_rcfile",
+ "Find a pycodestyle config file");
},
loadPycheckerRcFile: function() {
@@ -847,7 +847,7 @@ function python3_setup() {
[
"lint_python3_with_pychecker3",
"lint_python3_with_pylint3",
- "lint_python3_with_pep83",
+ "lint_python3_with_pycodestyle3",
"lint_python3_with_pyflakes3",
"pychecker3_browse_rcfile",
"pychecker3_browse_wrapper_location",
@@ -861,10 +861,10 @@ function python3_setup() {
"pylint3_checking_rcfile",
"pylint3_failure",
"pylint3_checking_vbox_rcfile",
- "pep83_browse_rcfile",
- "pep83_checking_rcfile",
- "pep83_failure",
- "pep83_checking_vbox_rcfile",
+ "pycodestyle3_browse_rcfile",
+ "pycodestyle3_checking_rcfile",
+ "pycodestyle3_failure",
+ "pycodestyle3_checking_vbox_rcfile",
"python3_lintOption"
].forEach(function(name) {
dialog.Python3[name] = document.getElementById(name);
@@ -875,10 +875,10 @@ function python3_setup() {
getService(Components.interfaces.koIAppInfoEx);
var python3Exe = appInfoEx.executablePath;
var pylint3StatusByExecutable = languageInfo.Python3.pylint3StatusByExecutable;
- var pep83StatusByExecutable = languageInfo.Python3.pep83StatusByExecutable;
+ var pycodestyle3StatusByExecutable = languageInfo.Python3.pycodestyle3StatusByExecutable;
var pyflakes3StatusByExecutable = languageInfo.Python3.pyflakes3StatusByExecutable;
if (!(python3Exe in pylint3StatusByExecutable)
- || !(python3Exe in pep83StatusByExecutable)
+ || !(python3Exe in pycodestyle3StatusByExecutable)
|| !(python3Exe in pyflakes3StatusByExecutable)) {
setTimeout(function() {
var res;
@@ -887,8 +887,8 @@ function python3_setup() {
res = appInfoEx.haveModules(1, ['pylint']);
pylint3StatusByExecutable[python3Exe] = res;
}
- if (!(python3Exe in pep83StatusByExecutable)) {
- pep83StatusByExecutable[python3Exe] = appInfoEx.haveModules(1, ['pep8']);
+ if (!(python3Exe in pycodestyle3StatusByExecutable)) {
+ pycodestyle3StatusByExecutable[python3Exe] = appInfoEx.haveModules(1, ['pycodestyle']);
}
if (!(python3Exe in pyflakes3StatusByExecutable)) {
res = appInfoEx.haveModules(1, ['pyflakes']);
@@ -907,7 +907,7 @@ languageSetup.Python3 = python3_setup;
function python3Info() {
return {
pylint3StatusByExecutable: {},
- pep83StatusByExecutable: {},
+ pycodestyle3StatusByExecutable: {},
pyflakes3StatusByExecutable: {},
_updateFailureBox: function(failureNode, python3Exe, linterName) {
@@ -938,18 +938,18 @@ function python3Info() {
}
this.onTogglePylint3Checking(checkbox);
- // pep8
- var checkbox = dialog.Python3.lint_python3_with_pep83;
- var failureNode = dialog.Python3.pep83_failure;
- if (python3Exe && this.pep83StatusByExecutable[python3Exe]) {
+ // pycodestyle
+ var checkbox = dialog.Python3.lint_python3_with_pycodestyle3;
+ var failureNode = dialog.Python3.pycodestyle3_failure;
+ if (python3Exe && this.pycodestyle3StatusByExecutable[python3Exe]) {
failureNode.setAttribute("class", "pref_hide");
checkbox.disabled = false;
} else {
checkbox.checked = false;
checkbox.disabled = true;
- this._updateFailureBox(failureNode, python3Exe, "pep8");
+ this._updateFailureBox(failureNode, python3Exe, "pycodestyle");
}
- this.onTogglePep83Checking(checkbox);
+ this.onTogglePycodestyle3Checking(checkbox);
// pyflakes3
checkbox = dialog.Python3.lint_python3_with_pyflakes3;
@@ -979,8 +979,8 @@ function python3Info() {
onTogglePylint3Checking: function(checkbox) {
dialog.Python3.pylint3_checking_vbox_rcfile.collapsed = !checkbox.checked;
},
- onTogglePep83Checking: function(checkbox) {
- dialog.Python3.pep83_checking_vbox_rcfile.collapsed = !checkbox.checked;
+ onTogglePycodestyle3Checking: function(checkbox) {
+ dialog.Python3.pycodestyle3_checking_vbox_rcfile.collapsed = !checkbox.checked;
},
onTogglePychecker3Checking: function(checkbox) {
var pychecker3Enabled = checkbox.checked;
@@ -1017,9 +1017,9 @@ function python3Info() {
"Find a .pylintrc file");
},
- loadPep83Rcfile: function() {
- this.loadTextboxFromFilepicker("pep83_checking_rcfile",
- "Find a pep8 config file");
+ loadPycodestyle3Rcfile: function() {
+ this.loadTextboxFromFilepicker("pycodestyle3_checking_rcfile",
+ "Find a pycodestyle config file");
},
loadPychecker3RcFile: function() {
diff --git a/src/chrome/komodo/content/pref/pref-syntax-checking.xul b/src/chrome/komodo/content/pref/pref-syntax-checking.xul
index ec68839c3f..249433ca7a 100644
--- a/src/chrome/komodo/content/pref/pref-syntax-checking.xul
+++ b/src/chrome/komodo/content/pref/pref-syntax-checking.xul
@@ -484,19 +484,19 @@
-
-
-
-
-
-
-
+ oncommand="languageInfo.Python.onTogglePycodestyleChecking(this);" />
+
+
+
+
+
+
@@ -565,20 +565,20 @@
-
-
+ oncommand="languageInfo.Python3.onTogglePycodestyle3Checking(this);" />
+
-
-
-
-
-
+
+
+
+
+
diff --git a/src/chrome/komodo/locale/en-US/pref/pref-languages.properties b/src/chrome/komodo/locale/en-US/pref/pref-languages.properties
index 09ea104e2f..2dd92d0a6a 100644
--- a/src/chrome/komodo/locale/en-US/pref/pref-languages.properties
+++ b/src/chrome/komodo/locale/en-US/pref/pref-languages.properties
@@ -51,7 +51,7 @@ savingKeyBindingsFailed=Attempt to save keybindings failed
AttemptSaveSharedServerInfoFailed=Attempt to save shared server info failed
The current Python instance X doesnt have X installed=The current Python instance,\n%S,\ndoesn't have %S installed.
The current Python3 instance X doesnt have X installed=The current Python3 instance,\n%S,\ndoesn't have %S installed.
-Find a pep8 config file=Find a pep8 config file
+Find a pycodestyle config file=Find a pycodestyle config file
Find a .pylintrc file=Find a .pylintrc file
Find a pychecker script=Find a pychecker script
Find a .pycheckrc file=Find a .pycheckrc file
diff --git a/src/chrome/komodo/locale/en-US/pref/pref.dtd b/src/chrome/komodo/locale/en-US/pref/pref.dtd
index 57a6f9c2d6..595c685798 100644
--- a/src/chrome/komodo/locale/en-US/pref/pref.dtd
+++ b/src/chrome/komodo/locale/en-US/pref/pref.dtd
@@ -390,8 +390,8 @@ adding an additional caret at the clicked position.">
-
-
+
+
diff --git a/src/lint/koPythonLinter.py b/src/lint/koPythonLinter.py
index 08e3a5edd3..199357206f 100644
--- a/src/lint/koPythonLinter.py
+++ b/src/lint/koPythonLinter.py
@@ -323,12 +323,12 @@ class KoPython3PyLintChecker(KoPythonCommonPyLintChecker):
lint_prefname = "lint_python3_with_pylint3"
rcfile_prefname = "pylint3_checking_rcfile"
-class KoPythonCommonPep8Checker(_GenericPythonLinter):
+class KoPythonCommonPycodestyleChecker(_GenericPythonLinter):
def lint_with_text(self, request, text):
if not text:
return None
prefset = request.prefset
- # if not prefset.getBooleanPref("lintPythonWithPep8"): return
+ # if not prefset.getBooleanPref("lintPythonWithPycodestyle"): return
if not prefset.getBooleanPref(self.lint_prefname):
return
pythonExe = self._pythonInfo.getExecutableFromPrefs(prefset)
@@ -342,7 +342,7 @@ def lint_with_text(self, request, text):
fout.close()
textlines = text.splitlines()
env = self._get_fixed_env(prefset, cwd)
- cmd = [pythonExe, '-m', 'pep8']
+ cmd = [pythonExe, '-m', 'pycodestyle']
checkRCFile = False
rcfilePath = prefset.getStringPref(self.rcfile_prefname)
if rcfilePath and os.path.exists(rcfilePath):
@@ -350,11 +350,11 @@ def lint_with_text(self, request, text):
checkRCFile = True
else:
extraArgs = []
- # default location: ~/.pep8
+ # default location: ~/.pycodestyle
homeDir = os.path.expanduser("~")
- rcfilePath = os.path.join(homeDir, ".pep8")
+ rcfilePath = os.path.join(homeDir, ".pycodestyle")
if not os.path.exists(rcfilePath):
- rcfilePath = os.path.join(homeDir, ".config", "pep8")
+ rcfilePath = os.path.join(homeDir, ".config", "pycodestyle")
checkRCFile = os.path.exists(rcfilePath)
preferredLineWidth = prefset.getLongPref("editAutoWrapColumn")
if preferredLineWidth > 0:
@@ -383,13 +383,13 @@ def lint_with_text(self, request, text):
try:
p = process.ProcessOpen(cmd, cwd=cwd, env=env, stdin=None)
stdout, stderr = p.communicate()
- # pep8 returns 1 if syntax errors were found, 0 otherwise.
- # If pep8 returns something else, this means that a runtime
+ # pycodestyle returns 1 if syntax errors were found, 0 otherwise.
+ # If pycodestyle returns something else, this means that a runtime
# error occured
if p.returncode not in [0, 1]:
pathMessageKey = "%s-%s" % (request.koDoc.displayPath, stderr)
_complainIfNeeded(pathMessageKey,
- "Error in pep8: %s", stderr)
+ "Error in pycodestyle: %s", stderr)
return
warnLines = stdout.splitlines(False) # Don't need the newlines.
except:
@@ -404,35 +404,35 @@ def lint_with_text(self, request, text):
if m:
lineNo = int(m.group("lineNum"))
columnNum = int(m.group("columnNum"))
- desc = "pep8: %s%s %s" % (m.group("status"),
+ desc = "pycodestyle: %s%s %s" % (m.group("status"),
m.group("statusCode"),
m.group("message"))
- # Everything pep8 complains about is a warning, by definition
+ # Everything pycodestyle complains about is a warning, by definition
severity = koLintResult.SEV_WARNING
koLintResult.createAddResult(results, textlines, severity, lineNo, desc, columnStart=columnNum)
return results
-class KoPythonPep8Checker(KoPythonCommonPep8Checker):
+class KoPythonPycodestyleChecker(KoPythonCommonPycodestyleChecker):
language_name = "Python"
- _reg_desc_ = "Komodo Python Pep8 Linter"
+ _reg_desc_ = "Komodo Python Pycodestyle Linter"
_reg_clsid_ = "{1c51ad7e-2788-448d-80f4-db6465164cc9}"
- _reg_contractid_ = "@activestate.com/koLinter?language=Python&type=pep8;1"
+ _reg_contractid_ = "@activestate.com/koLinter?language=Python&type=pycodestyle;1"
_reg_categories_ = [
- ("category-komodo-linter", 'Python&type=pep8'),
+ ("category-komodo-linter", 'Python&type=pycodestyle'),
]
- lint_prefname = "lint_python_with_pep8"
- rcfile_prefname = "pep8_checking_rcfile"
+ lint_prefname = "lint_python_with_pycodestyle"
+ rcfile_prefname = "pycodestyle_checking_rcfile"
-class KoPython3Pep8Checker(KoPythonCommonPep8Checker):
+class KoPython3PycodestyleChecker(KoPythonCommonPycodestyleChecker):
language_name = "Python3"
- _reg_desc_ = "Komodo Python3 Pep8 Linter"
+ _reg_desc_ = "Komodo Python3 Pycodestyle Linter"
_reg_clsid_ = "{4eb876a9-818d-4d94-b490-837bc306492c}"
- _reg_contractid_ = "@activestate.com/koLinter?language=Python3&type=pep8;1"
+ _reg_contractid_ = "@activestate.com/koLinter?language=Python3&type=pycodestyle;1"
_reg_categories_ = [
- ("category-komodo-linter", 'Python3&type=pep8'),
+ ("category-komodo-linter", 'Python3&type=pycodestyle'),
]
- lint_prefname = "lint_python3_with_pep83"
- rcfile_prefname = "pep83_checking_rcfile"
+ lint_prefname = "lint_python3_with_pycodestyle3"
+ rcfile_prefname = "pycodestyle3_checking_rcfile"
class KoPythonCommonPyflakesChecker(_GenericPythonLinter):
diff --git a/src/prefs/prefs.p.xml b/src/prefs/prefs.p.xml
index f545db704e..5d8a0d9bd2 100644
--- a/src/prefs/prefs.p.xml
+++ b/src/prefs/prefs.p.xml
@@ -249,8 +249,8 @@
false
false
- false
-
+ false
+
false
@@ -261,8 +261,8 @@
false
false
- false
-
+ false
+
false