Wed, 11 Sep 2013 19:17:57 +0200
Added capability to have different warning styles to the editor.
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | |
2302
f29e9405c851
Updated copyright for 2013.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2223
diff
changeset
|
3 | # Copyright (c) 2011 - 2013 Detlev Offenbach <detlev@die-offenbachs.de> |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | # |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
5 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | Module implementing a dialog to show the results of the PEP 8 check. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
10 | import os |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
11 | import fnmatch |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
12 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
13 | from PyQt4.QtCore import pyqtSlot, Qt |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
14 | from PyQt4.QtGui import QDialog, QTreeWidgetItem, QAbstractButton, \ |
2890
86b03a0c94bc
Started modifying PEP-8 dialog to change fixable state if a fixable issue could not be fixed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2881
diff
changeset
|
15 | QDialogButtonBox, QApplication, QHeaderView, QIcon |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
16 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | from E5Gui.E5Application import e5App |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
18 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
19 | from .Ui_Pep8Dialog import Ui_Pep8Dialog |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
20 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
21 | import UI.PixmapCache |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
22 | import Preferences |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
23 | import Utilities |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
24 | |
2895
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
25 | from . import pep8 |
2894
8e4264045fc9
Started implementing a PEP-8 naming checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
26 | from .Pep8NamingChecker import Pep8NamingChecker |
8e4264045fc9
Started implementing a PEP-8 naming checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
27 | |
2895
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
28 | # register the name checker |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
29 | pep8.register_check(Pep8NamingChecker, Pep8NamingChecker.Codes) |
4a44d92757f9
Implemented some fixers for wrong naming conventions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2894
diff
changeset
|
30 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
31 | |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
32 | class Pep8Report(pep8.BaseReport): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
33 | """ |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
34 | Class implementing a special report to be used with our dialog. |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
35 | """ |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
36 | def __init__(self, options): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
37 | """ |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
38 | Constructor |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
39 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
40 | @param options options for the report (optparse.Values) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
41 | """ |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
42 | super().__init__(options) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
43 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
44 | self.__repeat = options.repeat |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
45 | self.errors = [] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
46 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
47 | def error_args(self, line_number, offset, code, check, *args): |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
48 | """ |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
49 | Public method to collect the error messages. |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
50 | |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
51 | @param line_number line number of the issue (integer) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
52 | @param offset position within line of the issue (integer) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
53 | @param code message code (string) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
54 | @param check reference to the checker function (function) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
55 | @param args arguments for the message (list) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
56 | """ |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
57 | code = super().error_args(line_number, offset, code, check, *args) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
58 | if code and (self.counters[code] == 1 or self.__repeat): |
2894
8e4264045fc9
Started implementing a PEP-8 naming checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
59 | if code in Pep8NamingChecker.Codes: |
8e4264045fc9
Started implementing a PEP-8 naming checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
60 | text = Pep8NamingChecker.getMessage(code, *args) |
8e4264045fc9
Started implementing a PEP-8 naming checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
61 | else: |
8e4264045fc9
Started implementing a PEP-8 naming checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
62 | text = pep8.getMessage(code, *args) |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
63 | self.errors.append( |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
64 | (self.filename, line_number, offset, text) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
65 | ) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
66 | return code |
2863
62171fa4a6a4
Removed some obsolete code and corrected a PEP8 issue.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2862
diff
changeset
|
67 | |
62171fa4a6a4
Removed some obsolete code and corrected a PEP8 issue.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2862
diff
changeset
|
68 | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
69 | class Pep8Dialog(QDialog, Ui_Pep8Dialog): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
70 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
71 | Class implementing a dialog to show the results of the PEP 8 check. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
72 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
73 | filenameRole = Qt.UserRole + 1 |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
74 | lineRole = Qt.UserRole + 2 |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
75 | positionRole = Qt.UserRole + 3 |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
76 | messageRole = Qt.UserRole + 4 |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
77 | fixableRole = Qt.UserRole + 5 |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
78 | codeRole = Qt.UserRole + 6 |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
79 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
80 | def __init__(self, parent=None): |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
81 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
82 | Constructor |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
83 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
84 | @param parent reference to the parent widget (QWidget) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
85 | """ |
1131
7781e396c903
Changed the code to use super() to access the superclass.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1130
diff
changeset
|
86 | super().__init__(parent) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
87 | self.setupUi(self) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
88 | |
847
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
89 | self.statisticsButton = self.buttonBox.addButton( |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
90 | self.trUtf8("Statistics..."), QDialogButtonBox.ActionRole) |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
91 | self.statisticsButton.setToolTip( |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
92 | self.trUtf8("Press to show some statistics for the last run")) |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
93 | self.statisticsButton.setEnabled(False) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
94 | self.showButton = self.buttonBox.addButton( |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
95 | self.trUtf8("Show"), QDialogButtonBox.ActionRole) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
96 | self.showButton.setToolTip( |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
97 | self.trUtf8("Press to show all files containing an issue")) |
847
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
98 | self.showButton.setEnabled(False) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
99 | self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
100 | self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
101 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
102 | self.resultList.headerItem().setText(self.resultList.columnCount(), "") |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
103 | self.resultList.header().setSortIndicator(0, Qt.AscendingOrder) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
104 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
105 | self.noResults = True |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
106 | self.cancelled = False |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
107 | self.__lastFileItem = None |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
108 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
109 | self.__fileOrFileList = "" |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
110 | self.__project = None |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
111 | self.__forProject = False |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
112 | self.__data = {} |
847
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
113 | self.__statistics = {} |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
114 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
115 | self.on_loadDefaultButton_clicked() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
116 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
117 | def __resort(self): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
118 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
119 | Private method to resort the tree. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
120 | """ |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
121 | self.resultList.sortItems(self.resultList.sortColumn(), |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
122 | self.resultList.header().sortIndicatorOrder() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
123 | ) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
124 | |
2890
86b03a0c94bc
Started modifying PEP-8 dialog to change fixable state if a fixable issue could not be fixed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2881
diff
changeset
|
125 | def __createResultItem(self, file, line, pos, message, fixed, autofixing): |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
126 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
127 | Private method to create an entry in the result list. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
128 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
129 | @param file file name of the file (string) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
130 | @param line line number of issue (integer or string) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
131 | @param pos character position of issue (integer or string) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
132 | @param message message text (string) |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
133 | @param fixed flag indicating a fixed issue (boolean) |
2890
86b03a0c94bc
Started modifying PEP-8 dialog to change fixable state if a fixable issue could not be fixed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2881
diff
changeset
|
134 | @param autofixing flag indicating, that we are fixing issues |
86b03a0c94bc
Started modifying PEP-8 dialog to change fixable state if a fixable issue could not be fixed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2881
diff
changeset
|
135 | automatically (boolean) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
136 | @return reference to the created item (QTreeWidgetItem) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
137 | """ |
2404
cba0ff902c2b
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
138 | from .Pep8Fixer import Pep8FixableIssues |
cba0ff902c2b
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
139 | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
140 | if self.__lastFileItem is None: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
141 | # It's a new file |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
142 | self.__lastFileItem = QTreeWidgetItem(self.resultList, [file]) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
143 | self.__lastFileItem.setFirstColumnSpanned(True) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
144 | self.__lastFileItem.setExpanded(True) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
145 | self.__lastFileItem.setData(0, self.filenameRole, file) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
146 | |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
147 | fixable = False |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
148 | code, message = message.split(None, 1) |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
149 | itm = QTreeWidgetItem(self.__lastFileItem, |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
150 | ["{0:6}".format(line), code, message]) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
151 | if code.startswith("W"): |
847
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
152 | itm.setIcon(1, UI.PixmapCache.getIcon("warning.png")) |
2894
8e4264045fc9
Started implementing a PEP-8 naming checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
153 | elif code.startswith("N"): |
8e4264045fc9
Started implementing a PEP-8 naming checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2891
diff
changeset
|
154 | itm.setIcon(1, UI.PixmapCache.getIcon("namingError.png")) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
155 | else: |
847
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
156 | itm.setIcon(1, UI.PixmapCache.getIcon("syntaxError.png")) |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
157 | if fixed: |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
158 | itm.setIcon(0, UI.PixmapCache.getIcon("issueFixed.png")) |
2890
86b03a0c94bc
Started modifying PEP-8 dialog to change fixable state if a fixable issue could not be fixed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2881
diff
changeset
|
159 | elif code in Pep8FixableIssues and not autofixing: |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
160 | itm.setIcon(0, UI.PixmapCache.getIcon("issueFixable.png")) |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
161 | fixable = True |
847
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
162 | |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
163 | itm.setTextAlignment(0, Qt.AlignRight) |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
164 | itm.setTextAlignment(1, Qt.AlignHCenter) |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
165 | |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
166 | itm.setTextAlignment(0, Qt.AlignVCenter) |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
167 | itm.setTextAlignment(1, Qt.AlignVCenter) |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
168 | itm.setTextAlignment(2, Qt.AlignVCenter) |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
169 | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
170 | itm.setData(0, self.filenameRole, file) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
171 | itm.setData(0, self.lineRole, int(line)) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
172 | itm.setData(0, self.positionRole, int(pos)) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
173 | itm.setData(0, self.messageRole, message) |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
174 | itm.setData(0, self.fixableRole, fixable) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
175 | itm.setData(0, self.codeRole, code) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
176 | |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
177 | return itm |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
178 | |
2890
86b03a0c94bc
Started modifying PEP-8 dialog to change fixable state if a fixable issue could not be fixed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2881
diff
changeset
|
179 | def __modifyFixedResultItem(self, itm, text, fixed): |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
180 | """ |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
181 | Private method to modify a result list entry to show its |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
182 | positive fixed state. |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
183 | |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
184 | @param itm reference to the item to modify (QTreeWidgetItem) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
185 | @param text text to be appended (string) |
2890
86b03a0c94bc
Started modifying PEP-8 dialog to change fixable state if a fixable issue could not be fixed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2881
diff
changeset
|
186 | @param fixed flag indicating a fixed issue (boolean) |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
187 | """ |
2890
86b03a0c94bc
Started modifying PEP-8 dialog to change fixable state if a fixable issue could not be fixed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2881
diff
changeset
|
188 | if fixed: |
86b03a0c94bc
Started modifying PEP-8 dialog to change fixable state if a fixable issue could not be fixed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2881
diff
changeset
|
189 | message = itm.data(0, self.messageRole) + text |
86b03a0c94bc
Started modifying PEP-8 dialog to change fixable state if a fixable issue could not be fixed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2881
diff
changeset
|
190 | itm.setText(2, message) |
86b03a0c94bc
Started modifying PEP-8 dialog to change fixable state if a fixable issue could not be fixed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2881
diff
changeset
|
191 | itm.setIcon(0, UI.PixmapCache.getIcon("issueFixed.png")) |
86b03a0c94bc
Started modifying PEP-8 dialog to change fixable state if a fixable issue could not be fixed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2881
diff
changeset
|
192 | |
86b03a0c94bc
Started modifying PEP-8 dialog to change fixable state if a fixable issue could not be fixed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2881
diff
changeset
|
193 | itm.setData(0, self.messageRole, message) |
86b03a0c94bc
Started modifying PEP-8 dialog to change fixable state if a fixable issue could not be fixed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2881
diff
changeset
|
194 | else: |
86b03a0c94bc
Started modifying PEP-8 dialog to change fixable state if a fixable issue could not be fixed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2881
diff
changeset
|
195 | itm.setIcon(0, QIcon()) |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
196 | itm.setData(0, self.fixableRole, False) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
197 | |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
198 | def __updateStatistics(self, statistics, fixer): |
847
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
199 | """ |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
200 | Private method to update the collected statistics. |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
201 | |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
202 | @param statistics dictionary of statistical data with |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
203 | message code as key and message count as value |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
204 | @param fixer reference to the PEP 8 fixer (Pep8Fixer) |
847
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
205 | """ |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
206 | self.__statistics["_FilesCount"] += 1 |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
207 | if statistics: |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
208 | self.__statistics["_FilesIssues"] += 1 |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
209 | for key in statistics: |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
210 | if key in self.__statistics: |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
211 | self.__statistics[key] += statistics[key] |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
212 | else: |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
213 | self.__statistics[key] = statistics[key] |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
214 | if fixer: |
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
215 | self.__statistics["_IssuesFixed"] += fixer.fixed |
847
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
216 | |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
217 | def __updateFixerStatistics(self, fixer): |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
218 | """ |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
219 | Private method to update the collected fixer related statistics. |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
220 | |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
221 | @param fixer reference to the PEP 8 fixer (Pep8Fixer) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
222 | """ |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
223 | self.__statistics["_IssuesFixed"] += fixer.fixed |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
224 | |
847
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
225 | def __resetStatistics(self): |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
226 | """ |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
227 | Private slot to reset the statistics data. |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
228 | """ |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
229 | self.__statistics = {} |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
230 | self.__statistics["_FilesCount"] = 0 |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
231 | self.__statistics["_FilesIssues"] = 0 |
853
ec7dd115e26b
Continued implementing a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
849
diff
changeset
|
232 | self.__statistics["_IssuesFixed"] = 0 |
847
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
233 | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
234 | def prepare(self, fileList, project): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
235 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
236 | Public method to prepare the dialog with a list of filenames. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
237 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
238 | @param fileList list of filenames (list of strings) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
239 | @param project reference to the project object (Project) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
240 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
241 | self.__fileOrFileList = fileList[:] |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
242 | self.__project = project |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
243 | self.__forProject = True |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
244 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
245 | self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
246 | self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
247 | self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
248 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
249 | self.__data = self.__project.getData("CHECKERSPARMS", "Pep8Checker") |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
847
diff
changeset
|
250 | if self.__data is None or \ |
2866
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
251 | len(self.__data) < 6: |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
252 | # initialize the data structure |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
253 | self.__data = { |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
254 | "ExcludeFiles": "", |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
255 | "ExcludeMessages": pep8.DEFAULT_IGNORE, |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
256 | "IncludeMessages": "", |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
257 | "RepeatMessages": False, |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
258 | "FixCodes": "", |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
259 | "FixIssues": False, |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
260 | } |
2866
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
261 | if "MaxLineLength" not in self.__data: |
2881
e942480a6130
Fixed an issue in the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2878
diff
changeset
|
262 | self.__data["MaxLineLength"] = pep8.MAX_LINE_LENGTH |
2866
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
263 | if "HangClosing" not in self.__data: |
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
264 | self.__data["HangClosing"] = False |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
265 | if "NoFixCodes" not in self.__data: |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
266 | self.__data["NoFixCodes"] = "E501" |
2866
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
267 | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
268 | self.excludeFilesEdit.setText(self.__data["ExcludeFiles"]) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
269 | self.excludeMessagesEdit.setText(self.__data["ExcludeMessages"]) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
270 | self.includeMessagesEdit.setText(self.__data["IncludeMessages"]) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
271 | self.repeatCheckBox.setChecked(self.__data["RepeatMessages"]) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
847
diff
changeset
|
272 | self.fixIssuesEdit.setText(self.__data["FixCodes"]) |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
273 | self.noFixIssuesEdit.setText(self.__data["NoFixCodes"]) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
847
diff
changeset
|
274 | self.fixIssuesCheckBox.setChecked(self.__data["FixIssues"]) |
2866
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
275 | self.lineLengthSpinBox.setValue(self.__data["MaxLineLength"]) |
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
276 | self.hangClosingCheckBox.setChecked(self.__data["HangClosing"]) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
277 | |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
278 | def start(self, fn, save=False, repeat=None): |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
279 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
280 | Public slot to start the PEP 8 check. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
281 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
282 | @param fn file or list of files or directory to be checked |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
283 | (string or list of strings) |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
284 | @keyparam save flag indicating to save the given |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
285 | file/file list/directory (boolean) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
286 | @keyparam repeat state of the repeat check box if it is not None |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
287 | (None or boolean) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
288 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
289 | if self.__project is None: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
290 | self.__project = e5App().getObject("Project") |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
291 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
292 | self.cancelled = False |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
293 | self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
294 | self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
295 | self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True) |
940
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
296 | self.statisticsButton.setEnabled(False) |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
297 | self.showButton.setEnabled(False) |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
298 | self.fixButton.setEnabled(False) |
2902
15a5fe0b0a09
Changed PEP-8 dialog code to disable the the start button while a check is in progress.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2895
diff
changeset
|
299 | self.startButton.setEnabled(False) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
300 | if repeat is not None: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
301 | self.repeatCheckBox.setChecked(repeat) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
302 | QApplication.processEvents() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
303 | |
847
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
304 | self.__resetStatistics() |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
305 | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
306 | if save: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
307 | self.__fileOrFileList = fn |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
308 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
309 | if isinstance(fn, list): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
310 | files = fn[:] |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
311 | elif os.path.isdir(fn): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
312 | files = [] |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
313 | for ext in Preferences.getPython("Python3Extensions"): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
314 | files.extend( |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
315 | Utilities.direntries(fn, 1, '*{0}'.format(ext), 0)) |
843
522c8befcf49
Continued implementing a PRP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
832
diff
changeset
|
316 | for ext in Preferences.getPython("PythonExtensions"): |
522c8befcf49
Continued implementing a PRP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
832
diff
changeset
|
317 | files.extend( |
522c8befcf49
Continued implementing a PRP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
832
diff
changeset
|
318 | Utilities.direntries(fn, 1, '*{0}'.format(ext), 0)) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
319 | else: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
320 | files = [fn] |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
321 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
322 | # filter the list depending on the filter string |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
323 | if files: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
324 | filterString = self.excludeFilesEdit.text() |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
325 | filterList = [f.strip() for f in filterString.split(",") |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
326 | if f.strip()] |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
327 | for filter in filterList: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
328 | files = \ |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
329 | [f for f in files |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
330 | if not fnmatch.fnmatch(f, filter.strip())] |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
331 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
332 | py3files = [f for f in files \ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
333 | if f.endswith( |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
334 | tuple(Preferences.getPython("Python3Extensions")))] |
843
522c8befcf49
Continued implementing a PRP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
832
diff
changeset
|
335 | py2files = [f for f in files \ |
522c8befcf49
Continued implementing a PRP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
832
diff
changeset
|
336 | if f.endswith( |
522c8befcf49
Continued implementing a PRP 8 checker for Python2.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
832
diff
changeset
|
337 | tuple(Preferences.getPython("PythonExtensions")))] |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
338 | |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
847
diff
changeset
|
339 | if len(py3files) + len(py2files) > 0: |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
340 | self.checkProgress.setMaximum(len(py3files) + len(py2files)) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
341 | QApplication.processEvents() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
342 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
343 | # extract the configuration values |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
344 | excludeMessages = self.excludeMessagesEdit.text() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
345 | includeMessages = self.includeMessagesEdit.text() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
346 | repeatMessages = self.repeatCheckBox.isChecked() |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
847
diff
changeset
|
347 | fixCodes = self.fixIssuesEdit.text() |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
348 | noFixCodes = self.noFixIssuesEdit.text() |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
847
diff
changeset
|
349 | fixIssues = self.fixIssuesCheckBox.isChecked() and repeatMessages |
2866
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
350 | maxLineLength = self.lineLengthSpinBox.value() |
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
351 | hangClosing = self.hangClosingCheckBox.isChecked() |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
352 | |
940
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
353 | try: |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
354 | # disable updates of the list for speed |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
355 | self.resultList.setUpdatesEnabled(False) |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
356 | self.resultList.setSortingEnabled(False) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
357 | |
940
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
358 | # now go through all the files |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
359 | progress = 0 |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
360 | for file in py3files + py2files: |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
361 | self.checkProgress.setValue(progress) |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
362 | QApplication.processEvents() |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
363 | |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
364 | if self.cancelled: |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
365 | self.__resort() |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
366 | return |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
367 | |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
368 | self.__lastFileItem = None |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
369 | |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
370 | try: |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
371 | source, encoding = Utilities.readEncodedFile(file) |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
372 | source = source.splitlines(True) |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
373 | except (UnicodeError, IOError) as msg: |
847
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
374 | self.noResults = False |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
375 | self.__createResultItem(file, "1", "1", |
940
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
376 | self.trUtf8("Error: {0}").format(str(msg))\ |
2890
86b03a0c94bc
Started modifying PEP-8 dialog to change fixable state if a fixable issue could not be fixed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2881
diff
changeset
|
377 | .rstrip()[1:-1], False, False) |
940
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
378 | progress += 1 |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
379 | continue |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
380 | |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
381 | flags = Utilities.extractFlags(source) |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
382 | ext = os.path.splitext(file)[1] |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
383 | if fixIssues: |
2404
cba0ff902c2b
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
384 | from .Pep8Fixer import Pep8Fixer |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
385 | fixer = Pep8Fixer(self.__project, file, source, |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
386 | fixCodes, noFixCodes, maxLineLength, |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
387 | True) # always fix in place |
940
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
388 | else: |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
389 | fixer = None |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
390 | if ("FileType" in flags and |
940
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
391 | flags["FileType"] in ["Python", "Python2"]) or \ |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
392 | file in py2files or \ |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
393 | (ext in [".py", ".pyw"] and \ |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
394 | Preferences.getProject("DeterminePyFromProject") and \ |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
395 | self.__project.isOpen() and \ |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
396 | self.__project.isProjectFile(file) and \ |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
397 | self.__project.getProjectLanguage() in ["Python", |
940
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
398 | "Python2"]): |
2404
cba0ff902c2b
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
399 | from .Pep8Checker import Pep8Py2Checker |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2863
diff
changeset
|
400 | report = Pep8Py2Checker(file, [], |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
401 | repeat=repeatMessages, |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
402 | select=includeMessages, |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2863
diff
changeset
|
403 | ignore=excludeMessages, |
2866
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
404 | max_line_length=maxLineLength, |
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
405 | hang_closing=hangClosing, |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2863
diff
changeset
|
406 | ) |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2863
diff
changeset
|
407 | report.errors.sort(key=lambda a: a[1]) |
940
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
408 | else: |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
409 | if includeMessages: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
410 | select = [s.strip() for s in includeMessages.split(',') |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
411 | if s.strip()] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
412 | else: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
413 | select = [] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
414 | if excludeMessages: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
415 | ignore = [i.strip() for i in excludeMessages.split(',') |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
416 | if i.strip()] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
417 | else: |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
418 | ignore = [] |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
419 | styleGuide = pep8.StyleGuide( |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
420 | reporter=Pep8Report, |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
421 | repeat=repeatMessages, |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
422 | select=select, |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
423 | ignore=ignore, |
2866
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
424 | max_line_length=maxLineLength, |
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
425 | hang_closing=hangClosing, |
2862
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
426 | ) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
427 | report = styleGuide.check_files([file]) |
a1448560d7dc
Started upgrading the pep8 checker to the latest release.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2799
diff
changeset
|
428 | report.errors.sort(key=lambda a: a[1]) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
429 | deferredFixes = {} |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2863
diff
changeset
|
430 | for error in report.errors: |
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2863
diff
changeset
|
431 | fname, lineno, position, text = error |
2799
ec8c717e80f5
Fixed an issue in the pep8 checker tokenising a bad file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2404
diff
changeset
|
432 | if lineno > len(source): |
ec8c717e80f5
Fixed an issue in the pep8 checker tokenising a bad file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2404
diff
changeset
|
433 | lineno = len(source) |
1308
2b602a1521e7
Made the check for line flags like __IGNORE_WARNING__ more flexible and extensible.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
434 | if "__IGNORE_WARNING__" not in Utilities.extractLineFlags( |
2b602a1521e7
Made the check for line flags like __IGNORE_WARNING__ more flexible and extensible.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1131
diff
changeset
|
435 | source[lineno - 1].strip()): |
940
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
436 | self.noResults = False |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
437 | if fixer: |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
438 | res, msg, id_ = fixer.fixIssue(lineno, position, text) |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
439 | if res == 1: |
940
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
440 | text += "\n" + \ |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
441 | self.trUtf8("Fix: {0}").format(msg) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
442 | self.__createResultItem( |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
443 | fname, lineno, position, text, True, True) |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
444 | elif res == 0: |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
445 | self.__createResultItem( |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
446 | fname, lineno, position, text, False, True) |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
447 | else: |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
448 | itm = self.__createResultItem( |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
449 | fname, lineno, position, |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
450 | text, False, False) |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
451 | deferredFixes[id_] = itm |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
452 | else: |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
453 | self.__createResultItem( |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
454 | fname, lineno, position, text, False, False) |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
455 | if fixer: |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
456 | deferredResults = fixer.finalize() |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
457 | for id_ in deferredResults: |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
458 | fixed, msg = deferredResults[id_] |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
459 | itm = deferredFixes[id_] |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
460 | if fixed == 1: |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
461 | text = "\n" + self.trUtf8("Fix: {0}").format(msg) |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
462 | self.__modifyFixedResultItem(itm, text, True) |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
463 | else: |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
464 | self.__modifyFixedResultItem(itm, "", False) |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
465 | fixer.saveFile(encoding) |
2864
d973dab8b715
Upgraded the Py2 part of the pep8 checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2863
diff
changeset
|
466 | self.__updateStatistics(report.counters, fixer) |
940
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
467 | progress += 1 |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
468 | finally: |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
469 | # reenable updates of the list |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
470 | self.resultList.setSortingEnabled(True) |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
471 | self.resultList.setUpdatesEnabled(True) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
472 | self.checkProgress.setValue(progress) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
473 | QApplication.processEvents() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
474 | self.__resort() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
475 | else: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
476 | self.checkProgress.setMaximum(1) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
477 | self.checkProgress.setValue(1) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
478 | self.__finish() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
479 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
480 | def __finish(self): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
481 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
482 | Private slot called when the PEP 8 check finished or the user |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
483 | pressed the cancel button. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
484 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
485 | self.cancelled = True |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
486 | self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
487 | self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
488 | self.buttonBox.button(QDialogButtonBox.Close).setDefault(True) |
940
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
489 | self.statisticsButton.setEnabled(True) |
0f5461fe69d4
Implemented some speed improvements for the PEP 8 checker dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
853
diff
changeset
|
490 | self.showButton.setEnabled(True) |
2902
15a5fe0b0a09
Changed PEP-8 dialog code to disable the the start button while a check is in progress.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2895
diff
changeset
|
491 | self.startButton.setEnabled(True) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
492 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
493 | if self.noResults: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
494 | QTreeWidgetItem(self.resultList, [self.trUtf8('No issues found.')]) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
495 | QApplication.processEvents() |
847
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
496 | self.statisticsButton.setEnabled(False) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
497 | self.showButton.setEnabled(False) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
498 | self.__clearErrors() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
499 | else: |
847
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
500 | self.statisticsButton.setEnabled(True) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
501 | self.showButton.setEnabled(True) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
502 | self.resultList.header().resizeSections(QHeaderView.ResizeToContents) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
503 | self.resultList.header().setStretchLastSection(True) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
504 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
505 | @pyqtSlot() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
506 | def on_startButton_clicked(self): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
507 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
508 | Private slot to start a PEP 8 check run. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
509 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
510 | if self.__forProject: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
511 | data = { |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
512 | "ExcludeFiles": self.excludeFilesEdit.text(), |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
513 | "ExcludeMessages": self.excludeMessagesEdit.text(), |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
514 | "IncludeMessages": self.includeMessagesEdit.text(), |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
515 | "RepeatMessages": self.repeatCheckBox.isChecked(), |
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
516 | "FixCodes": self.fixIssuesEdit.text(), |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
517 | "NoFixCodes": self.noFixIssuesEdit.text(), |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
518 | "FixIssues": self.fixIssuesCheckBox.isChecked(), |
2866
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
519 | "MaxLineLength": self.lineLengthSpinBox.value(), |
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
520 | "HangClosing": self.hangClosingCheckBox.isChecked(), |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
521 | } |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
522 | if data != self.__data: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
523 | self.__data = data |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
524 | self.__project.setData("CHECKERSPARMS", "Pep8Checker", |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
525 | self.__data) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
526 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
527 | self.resultList.clear() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
528 | self.noResults = True |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
529 | self.cancelled = False |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
530 | self.start(self.__fileOrFileList) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
531 | |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
532 | def __selectCodes(self, edit, showFixCodes): |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
533 | """ |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
534 | Private method to select message codes via a selection dialog. |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
535 | |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
536 | @param edit reference of the line edit to be populated (QLineEdit) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
537 | @param showFixCodes flag indicating to show a list of fixable |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
538 | issues (boolean) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
539 | """ |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
540 | from .Pep8CodeSelectionDialog import Pep8CodeSelectionDialog |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
541 | dlg = Pep8CodeSelectionDialog(edit.text(), showFixCodes, self) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
542 | if dlg.exec_() == QDialog.Accepted: |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
543 | edit.setText(dlg.getSelectedCodes()) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
544 | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
545 | @pyqtSlot() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
546 | def on_excludeMessagesSelectButton_clicked(self): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
547 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
548 | Private slot to select the message codes to be excluded via a |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
549 | selection dialog. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
550 | """ |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
551 | self.__selectCodes(self.excludeMessagesEdit, False) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
552 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
553 | @pyqtSlot() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
554 | def on_includeMessagesSelectButton_clicked(self): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
555 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
556 | Private slot to select the message codes to be included via a |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
557 | selection dialog. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
558 | """ |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
559 | self.__selectCodes(self.includeMessagesEdit, False) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
560 | |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
847
diff
changeset
|
561 | @pyqtSlot() |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
847
diff
changeset
|
562 | def on_fixIssuesSelectButton_clicked(self): |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
847
diff
changeset
|
563 | """ |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
847
diff
changeset
|
564 | Private slot to select the issue codes to be fixed via a |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
847
diff
changeset
|
565 | selection dialog. |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
847
diff
changeset
|
566 | """ |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
567 | self.__selectCodes(self.fixIssuesEdit, True) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
568 | |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
569 | @pyqtSlot() |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
570 | def on_noFixIssuesSelectButton_clicked(self): |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
571 | """ |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
572 | Private slot to select the issue codes not to be fixed via a |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
573 | selection dialog. |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
574 | """ |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
575 | self.__selectCodes(self.noFixIssuesEdit, True) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
847
diff
changeset
|
576 | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
577 | @pyqtSlot(QTreeWidgetItem, int) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
578 | def on_resultList_itemActivated(self, item, column): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
579 | """ |
945
8cd4d08fa9f6
Made code mostly PEP 8 compliant (except all whitespace and line length).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
940
diff
changeset
|
580 | Private slot to handle the activation of an item. |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
581 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
582 | @param item reference to the activated item (QTreeWidgetItem) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
583 | @param column column the item was activated in (integer) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
584 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
585 | if self.noResults: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
586 | return |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
587 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
588 | if item.parent(): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
589 | fn = Utilities.normabspath(item.data(0, self.filenameRole)) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
590 | lineno = item.data(0, self.lineRole) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
591 | position = item.data(0, self.positionRole) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
592 | message = item.data(0, self.messageRole) |
2904
1da821da961e
Changed editor code to allow multiple syntax error messages per line and changed PEP-8 dialog to show E901 errors as error instead of warning.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2902
diff
changeset
|
593 | code = item.data(0, self.codeRole) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
594 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
595 | vm = e5App().getObject("ViewManager") |
2874
0d754c68e1db
Fixed an issue in the PEP-8 dialog caused by the new checker being one off compared to the old one.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2867
diff
changeset
|
596 | vm.openSourceFile(fn, lineno=lineno, pos=position + 1) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
597 | editor = vm.getOpenEditor(fn) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
598 | |
2904
1da821da961e
Changed editor code to allow multiple syntax error messages per line and changed PEP-8 dialog to show E901 errors as error instead of warning.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2902
diff
changeset
|
599 | if code == "E901": |
1da821da961e
Changed editor code to allow multiple syntax error messages per line and changed PEP-8 dialog to show E901 errors as error instead of warning.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2902
diff
changeset
|
600 | editor.toggleSyntaxError(lineno, 0, True, message, True) |
1da821da961e
Changed editor code to allow multiple syntax error messages per line and changed PEP-8 dialog to show E901 errors as error instead of warning.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2902
diff
changeset
|
601 | else: |
2905
a1ae4b297bc0
Added capability to have different warning styles to the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2904
diff
changeset
|
602 | editor.toggleFlakesWarning( |
a1ae4b297bc0
Added capability to have different warning styles to the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2904
diff
changeset
|
603 | lineno, True, message, warningType=editor.WarningStyle) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
604 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
605 | @pyqtSlot() |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
606 | def on_resultList_itemSelectionChanged(self): |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
607 | """ |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
608 | Private slot to change the dialog state depending on the selection. |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
609 | """ |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
610 | self.fixButton.setEnabled(len(self.__getSelectedFixableItems()) > 0) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
611 | |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
612 | @pyqtSlot() |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
613 | def on_showButton_clicked(self): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
614 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
615 | Private slot to handle the "Show" button press. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
616 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
617 | vm = e5App().getObject("ViewManager") |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
618 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
619 | selectedIndexes = [] |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
620 | for index in range(self.resultList.topLevelItemCount()): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
621 | if self.resultList.topLevelItem(index).isSelected(): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
622 | selectedIndexes.append(index) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
623 | if len(selectedIndexes) == 0: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
624 | selectedIndexes = list(range(self.resultList.topLevelItemCount())) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
625 | for index in selectedIndexes: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
626 | itm = self.resultList.topLevelItem(index) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
627 | fn = Utilities.normabspath(itm.data(0, self.filenameRole)) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
628 | vm.openSourceFile(fn, 1) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
629 | editor = vm.getOpenEditor(fn) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
630 | editor.clearFlakesWarnings() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
631 | for cindex in range(itm.childCount()): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
632 | citm = itm.child(cindex) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
633 | lineno = citm.data(0, self.lineRole) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
634 | message = citm.data(0, self.messageRole) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
635 | editor.toggleFlakesWarning(lineno, True, message) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
636 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
637 | # go through the list again to clear warning markers for files, |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
638 | # that are ok |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
639 | openFiles = vm.getOpenFilenames() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
640 | errorFiles = [] |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
641 | for index in range(self.resultList.topLevelItemCount()): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
642 | itm = self.resultList.topLevelItem(index) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
643 | errorFiles.append( |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
644 | Utilities.normabspath(itm.data(0, self.filenameRole))) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
645 | for file in openFiles: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
646 | if not file in errorFiles: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
647 | editor = vm.getOpenEditor(file) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
648 | editor.clearFlakesWarnings() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
649 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
650 | @pyqtSlot() |
847
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
651 | def on_statisticsButton_clicked(self): |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
652 | """ |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
653 | Private slot to show the statistics dialog. |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
654 | """ |
2404
cba0ff902c2b
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
655 | from .Pep8StatisticsDialog import Pep8StatisticsDialog |
847
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
656 | dlg = Pep8StatisticsDialog(self.__statistics, self) |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
657 | dlg.exec_() |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
658 | |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
659 | @pyqtSlot() |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
660 | def on_loadDefaultButton_clicked(self): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
661 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
662 | Private slot to load the default configuration values. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
663 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
664 | self.excludeFilesEdit.setText(Preferences.Prefs.settings.value( |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
665 | "PEP8/ExcludeFilePatterns")) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
666 | self.excludeMessagesEdit.setText(Preferences.Prefs.settings.value( |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
667 | "PEP8/ExcludeMessages", pep8.DEFAULT_IGNORE)) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
668 | self.includeMessagesEdit.setText(Preferences.Prefs.settings.value( |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
669 | "PEP8/IncludeMessages")) |
2878
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
670 | self.repeatCheckBox.setChecked(Preferences.toBool( |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
671 | Preferences.Prefs.settings.value("PEP8/RepeatMessages"))) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
847
diff
changeset
|
672 | self.fixIssuesEdit.setText(Preferences.Prefs.settings.value( |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
847
diff
changeset
|
673 | "PEP8/FixCodes")) |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
674 | self.noFixIssuesEdit.setText(Preferences.Prefs.settings.value( |
2878
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
675 | "PEP8/NoFixCodes", "E501")) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
847
diff
changeset
|
676 | self.fixIssuesCheckBox.setChecked(Preferences.toBool( |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
847
diff
changeset
|
677 | Preferences.Prefs.settings.value("PEP8/FixIssues"))) |
2866
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
678 | self.lineLengthSpinBox.setValue(int(Preferences.Prefs.settings.value( |
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
679 | "PEP8/MaxLineLength", pep8.MAX_LINE_LENGTH))) |
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
680 | self.hangClosingCheckBox.setChecked(Preferences.toBool( |
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
681 | Preferences.Prefs.settings.value("PEP8/HangClosing"))) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
682 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
683 | @pyqtSlot() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
684 | def on_storeDefaultButton_clicked(self): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
685 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
686 | Private slot to store the current configuration values as |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
687 | default values. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
688 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
689 | Preferences.Prefs.settings.setValue("PEP8/ExcludeFilePatterns", |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
690 | self.excludeFilesEdit.text()) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
691 | Preferences.Prefs.settings.setValue("PEP8/ExcludeMessages", |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
692 | self.excludeMessagesEdit.text()) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
693 | Preferences.Prefs.settings.setValue("PEP8/IncludeMessages", |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
694 | self.includeMessagesEdit.text()) |
2878
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
695 | Preferences.Prefs.settings.setValue("PEP8/RepeatMessages", |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
696 | self.repeatCheckBox.isChecked()) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
847
diff
changeset
|
697 | Preferences.Prefs.settings.setValue("PEP8/FixCodes", |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
847
diff
changeset
|
698 | self.fixIssuesEdit.text()) |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
699 | Preferences.Prefs.settings.setValue("PEP8/NoFixCodes", |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
700 | self.noFixIssuesEdit.text()) |
849
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
847
diff
changeset
|
701 | Preferences.Prefs.settings.setValue("PEP8/FixIssues", |
996367a89673
Started to implement a fixer for PEP 8 issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
847
diff
changeset
|
702 | self.fixIssuesCheckBox.isChecked()) |
2866
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
703 | Preferences.Prefs.settings.setValue("PEP8/MaxLineLength", |
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
704 | self.lineLengthSpinBox.value()) |
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
705 | Preferences.Prefs.settings.setValue("PEP8/HangClosing", |
c77e08c38a5c
Extended the PEP-8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2864
diff
changeset
|
706 | self.hangClosingCheckBox.isChecked()) |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
707 | |
2878
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
708 | @pyqtSlot() |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
709 | def on_resetDefaultButton_clicked(self): |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
710 | """ |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
711 | Slot documentation goes here. |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
712 | """ |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
713 | raise NotImplementedError |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
714 | Preferences.Prefs.settings.setValue("PEP8/ExcludeFilePatterns", "") |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
715 | Preferences.Prefs.settings.setValue("PEP8/ExcludeMessages", |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
716 | pep8.DEFAULT_IGNORE) |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
717 | Preferences.Prefs.settings.setValue("PEP8/IncludeMessages", "") |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
718 | Preferences.Prefs.settings.setValue("PEP8/RepeatMessages", False) |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
719 | Preferences.Prefs.settings.setValue("PEP8/FixCodes", "") |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
720 | Preferences.Prefs.settings.setValue("PEP8/NoFixCodes", "E501") |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
721 | Preferences.Prefs.settings.setValue("PEP8/FixIssues", False) |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
722 | Preferences.Prefs.settings.setValue("PEP8/MaxLineLength", |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
723 | pep8.MAX_LINE_LENGTH) |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
724 | Preferences.Prefs.settings.setValue("PEP8/HangClosing", False) |
61042247f793
Added a button to the PEP-8 dialog to reset the default values.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2876
diff
changeset
|
725 | |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
726 | @pyqtSlot(QAbstractButton) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
727 | def on_buttonBox_clicked(self, button): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
728 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
729 | Private slot called by a button of the button box clicked. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
730 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
731 | @param button button that was clicked (QAbstractButton) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
732 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
733 | if button == self.buttonBox.button(QDialogButtonBox.Close): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
734 | self.close() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
735 | elif button == self.buttonBox.button(QDialogButtonBox.Cancel): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
736 | self.__finish() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
737 | elif button == self.showButton: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
738 | self.on_showButton_clicked() |
847
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
739 | elif button == self.statisticsButton: |
cc18fbcde9fc
Added a dialog to show some statistics for the last PEP 8 check to the PEP 8 dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
843
diff
changeset
|
740 | self.on_statisticsButton_clicked() |
832
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
741 | |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
742 | def __clearErrors(self): |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
743 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
744 | Private method to clear all warning markers of open editors. |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
745 | """ |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
746 | vm = e5App().getObject("ViewManager") |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
747 | openFiles = vm.getOpenFilenames() |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
748 | for file in openFiles: |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
749 | editor = vm.getOpenEditor(file) |
eb5ff61f927b
Added a checker for PEP 8 compliance.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
750 | editor.clearFlakesWarnings() |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
751 | |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
752 | @pyqtSlot() |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
753 | def on_fixButton_clicked(self): |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
754 | """ |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
755 | Private slot to fix selected issues. |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
756 | """ |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
757 | from .Pep8Fixer import Pep8Fixer |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
758 | |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
759 | # build a dictionary of issues to fix |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
760 | fixableItems = self.__getSelectedFixableItems() |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
761 | fixesDict = {} # dictionary of lists of tuples containing |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
762 | # the issue and the item |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
763 | for itm in fixableItems: |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
764 | filename = itm.data(0, self.filenameRole) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
765 | if filename not in fixesDict: |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
766 | fixesDict[filename] = [] |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
767 | fixesDict[filename].append(( |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
768 | (itm.data(0, self.lineRole), |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
769 | itm.data(0, self.positionRole), |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
770 | "{0} {1}".format(itm.data(0, self.codeRole), |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
771 | itm.data(0, self.messageRole))), |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
772 | itm |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
773 | )) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
774 | |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
775 | # extract the configuration values |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
776 | fixCodes = self.fixIssuesEdit.text() |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
777 | noFixCodes = self.noFixIssuesEdit.text() |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
778 | maxLineLength = self.lineLengthSpinBox.value() |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
779 | |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
780 | # now go through all the files |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
781 | if fixesDict: |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
782 | self.checkProgress.setMaximum(len(fixesDict)) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
783 | progress = 0 |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
784 | for file in fixesDict: |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
785 | self.checkProgress.setValue(progress) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
786 | QApplication.processEvents() |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
787 | |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
788 | try: |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
789 | source, encoding = Utilities.readEncodedFile(file) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
790 | source = source.splitlines(True) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
791 | except (UnicodeError, IOError) as msg: |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
792 | # skip silently because that should not happen |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
793 | progress += 1 |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
794 | continue |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
795 | |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
796 | deferredFixes = {} |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
797 | fixer = Pep8Fixer(self.__project, file, source, |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
798 | fixCodes, noFixCodes, maxLineLength, |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
799 | True) # always fix in place |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
800 | errors = fixesDict[file] |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
801 | errors.sort(key=lambda a: a[0][0]) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
802 | for error in errors: |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
803 | (lineno, position, text), itm = error |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
804 | if lineno > len(source): |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
805 | lineno = len(source) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
806 | fixed, msg, id_ = fixer.fixIssue(lineno, position, text) |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
807 | if fixed == 1: |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
808 | text = "\n" + self.trUtf8("Fix: {0}").format(msg) |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
809 | self.__modifyFixedResultItem(itm, text, True) |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
810 | elif fixed == 0: |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
811 | self.__modifyFixedResultItem(itm, "", False) |
2890
86b03a0c94bc
Started modifying PEP-8 dialog to change fixable state if a fixable issue could not be fixed.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2881
diff
changeset
|
812 | else: |
2891
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
813 | # remember item for the deferred fix |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
814 | deferredFixes[id_] = itm |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
815 | deferredResults = fixer.finalize() |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
816 | for id_ in deferredResults: |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
817 | fixed, msg = deferredResults[id_] |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
818 | itm = deferredFixes[id_] |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
819 | if fixed == 1: |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
820 | text = "\n" + self.trUtf8("Fix: {0}").format(msg) |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
821 | self.__modifyFixedResultItem(itm, text, True) |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
822 | else: |
6843b7d23279
Changed the PEP-8 fixer and dialog to decouple the indication of the fixed status from the generation of the PEP-8 status.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2890
diff
changeset
|
823 | self.__modifyFixedResultItem(itm, "", False) |
2876
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
824 | fixer.saveFile(encoding) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
825 | |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
826 | self.__updateFixerStatistics(fixer) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
827 | progress += 1 |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
828 | |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
829 | self.checkProgress.setValue(progress) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
830 | QApplication.processEvents() |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
831 | |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
832 | def __getSelectedFixableItems(self): |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
833 | """ |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
834 | Private method to extract all selected items for fixable issues. |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
835 | |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
836 | @return selected items for fixable issues (list of QTreeWidgetItem) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
837 | """ |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
838 | fixableItems = [] |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
839 | for itm in self.resultList.selectedItems(): |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
840 | if itm.childCount() > 0: |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
841 | for index in range(itm.childCount()): |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
842 | citm = itm.child(index) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
843 | if self.__itemFixable(citm) and not citm in fixableItems: |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
844 | fixableItems.append(citm) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
845 | elif self.__itemFixable(itm) and not itm in fixableItems: |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
846 | fixableItems.append(itm) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
847 | |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
848 | return fixableItems |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
849 | |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
850 | def __itemFixable(self, itm): |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
851 | """ |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
852 | Private method to check, if an item has a fixable issue. |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
853 | |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
854 | @param itm item to be checked (QTreeWidgetItem) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
855 | @return flag indicating a fixable issue (boolean) |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
856 | """ |
bfa39cf40277
Extended the PEP-8 dialog to select fixable issues manually (i.e. fix only the selected issues).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2874
diff
changeset
|
857 | return itm.data(0, self.fixableRole) |