Mercurial Repositories > eric / changeset
changeset
Merged remote changes.
Tue, 16 Nov 2010 19:18:09 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 16 Nov 2010 19:18:09 +0100
- changeset 725
- 7b0a5408e123
- parent 724
- a55a889b88bb (current diff)
- parent 723
- 49ef401db2ce (diff)
- child 727
- 6dc2a30ee786
Merged remote changes.
--- a/DebugClients/Python3/DebugClientBase.py Tue Nov 16 19:17:16 2010 +0100 +++ b/DebugClients/Python3/DebugClientBase.py Tue Nov 16 19:18:09 2010 +0100 @@ -20,7 +20,7 @@ from DebugProtocol import * import DebugClientCapabilities -from DebugBase import setRecursionLimit, printerr +from DebugBase import setRecursionLimit, printerr # __IGNORE_WARNING__ from AsyncFile import * from DebugConfig import ConfigVarTypeStrings from FlexCompleter import Completer @@ -932,7 +932,7 @@ @return client capabilities (integer) """ try: - import PyProfile + import PyProfile # __IGNORE_WARNING__ try: del sys.modules['PyProfile'] except KeyError:
--- a/IconEditor/IconEditorGrid.py Tue Nov 16 19:17:16 2010 +0100 +++ b/IconEditor/IconEditorGrid.py Tue Nov 16 19:18:09 2010 +0100 @@ -12,7 +12,7 @@ from E5Gui import E5MessageBox -from .cursors import cursors_rc +from .cursors import cursors_rc # __IGNORE_WARNING__ from .IconSizeDialog import IconSizeDialog
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Tue Nov 16 19:17:16 2010 +0100 +++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Tue Nov 16 19:18:09 2010 +0100 @@ -173,6 +173,7 @@ else: if Preferences.getFlakes("IncludeInSyntaxCheck"): try: + sourceLines = source.splitlines() warnings = Checker(source, file) warnings.messages.sort(key = lambda a: a.lineno) for warning in warnings.messages: @@ -181,8 +182,10 @@ continue self.noResults = False fname, lineno, message = warning.getMessageData() - self.__createResultItem(fname, lineno, message, "", - isWarning = True) + if not sourceLines[lineno - 1].strip()\ + .endswith("__IGNORE_WARNING__"): + self.__createResultItem(fname, lineno, message, "", + isWarning = True) except SyntaxError as err: if err.text.strip(): msg = err.text.strip()
--- a/Plugins/PluginVcsPySvn.py Tue Nov 16 19:17:16 2010 +0100 +++ b/Plugins/PluginVcsPySvn.py Tue Nov 16 19:18:09 2010 +0100 @@ -73,7 +73,7 @@ global pluginTypename data = {} try: - import pysvn + import pysvn # __IGNORE_WARNING__ data[".svn"] = (pluginTypename, displayString()) data["_svn"] = (pluginTypename, displayString()) except ImportError: @@ -87,7 +87,7 @@ @return display string (string) """ try: - import pysvn + import pysvn # __IGNORE_WARNING__ return QApplication.translate('VcsPySvnPlugin', 'Subversion (pysvn)') except ImportError: return ""
--- a/QScintilla/Editor.py Tue Nov 16 19:17:16 2010 +0100 +++ b/QScintilla/Editor.py Tue Nov 16 19:18:09 2010 +0100 @@ -4097,7 +4097,9 @@ continue _fn, lineno, message = warning.getMessageData() - self.toggleFlakesWarning(lineno, True, message) + if not self.text(lineno - 1).strip()\ + .endswith("__IGNORE_WARNING__"): + self.toggleFlakesWarning(lineno, True, message) except SyntaxError as err: if err.text.strip(): msg = err.text.strip()
--- a/Utilities/uic.py Tue Nov 16 19:17:16 2010 +0100 +++ b/Utilities/uic.py Tue Nov 16 19:18:09 2010 +0100 @@ -22,7 +22,8 @@ except ImportError: from PyQt4.uic import compileUi - def compileUiDir(dir, recurse = False, map = None, **compileUi_args): + def compileUiDir(dir, recurse = False, map = None, # __IGNORE_WARNING__ + **compileUi_args): """ Creates Python modules from Qt Designer .ui files in a directory or directory tree.
--- a/compileUiFiles.py Tue Nov 16 19:17:16 2010 +0100 +++ b/compileUiFiles.py Tue Nov 16 19:18:09 2010 +0100 @@ -20,7 +20,8 @@ except ImportError: from PyQt4.uic import compileUi - def compileUiDir(dir, recurse = False, map = None, **compileUi_args): + def compileUiDir(dir, recurse = False, map = None, # __IGNORE_WARNING__ + **compileUi_args): """ Creates Python modules from Qt Designer .ui files in a directory or directory tree.
--- a/eric5-configure.py Tue Nov 16 19:17:16 2010 +0100 +++ b/eric5-configure.py Tue Nov 16 19:18:09 2010 +0100 @@ -23,7 +23,7 @@ # make ThirdParty package available as a packages repository try: - import pygments + import pygments # __IGNORE_WARNING__ except ImportError: sys.path.insert(2, os.path.join(os.path.dirname(__file__), "ThirdParty", "Pygments"))
--- a/eric5-editor.py Tue Nov 16 19:17:16 2010 +0100 +++ b/eric5-editor.py Tue Nov 16 19:18:09 2010 +0100 @@ -25,7 +25,7 @@ # make ThirdParty package available as a packages repository try: - import pygments + import pygments # __IGNORE_WARNING__ except ImportError: sys.path.insert(2, os.path.join(os.path.dirname(__file__), "ThirdParty", "Pygments")) @@ -65,4 +65,4 @@ sys.exit(res) if __name__ == '__main__': - main() \ No newline at end of file + main()
--- a/eric5-webbrowser.py Tue Nov 16 19:17:16 2010 +0100 +++ b/eric5-webbrowser.py Tue Nov 16 19:18:09 2010 +0100 @@ -25,7 +25,7 @@ # make ThirdParty package available as a packages repository try: - import pygments + import pygments # __IGNORE_WARNING__ except ImportError: sys.path.insert(2, os.path.join(os.path.dirname(__file__), "ThirdParty", "Pygments"))
--- a/eric5.py Tue Nov 16 19:17:16 2010 +0100 +++ b/eric5.py Tue Nov 16 19:18:09 2010 +0100 @@ -44,7 +44,7 @@ # make Third-Party package available as a packages repository try: - import pygments + import pygments # __IGNORE_WARNING__ except ImportError: sys.path.insert(2, os.path.join(os.path.dirname(__file__), "ThirdParty", "Pygments"))
--- a/install.py Tue Nov 16 19:17:16 2010 +0100 +++ b/install.py Tue Nov 16 19:18:09 2010 +0100 @@ -581,7 +581,7 @@ print("Found PyQt") try: - from PyQt4 import Qsci + from PyQt4 import Qsci # __IGNORE_WARNING__ except ImportError as msg: print("Sorry, please install QScintilla2 and") print("it's PyQt4 wrapper.") @@ -673,7 +673,8 @@ except ImportError: from PyQt4.uic import compileUi - def compileUiDir(dir, recurse = False, map = None, **compileUi_args): + def compileUiDir(dir, recurse = False, map = None, # __IGNORE_WARNING__ + **compileUi_args): """ Creates Python modules from Qt Designer .ui files in a directory or directory tree.
