[eclipse-pydev] 02/05: Merge tag 'upstream/3.7.1'
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Fri Sep 12 19:29:17 UTC 2014
This is an automated email from the git hooks/post-receive script.
xhaakon-guest pushed a commit to branch master
in repository eclipse-pydev.
commit 78882f116a15b39c29a2bbeddc389e678536cd64
Merge: 9263431 e7d2f32
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Fri Sep 12 20:40:13 2014 +0200
Merge tag 'upstream/3.7.1'
Upstream version 3.7.1
features/org.python.pydev.feature/feature.xml | 40 +-
features/org.python.pydev.feature/pom.xml | 2 +-
features/org.python.pydev.mylyn.feature/pom.xml | 2 +-
features/org.python.pydev.p2-repo/pom.xml | 2 +-
features/pom.xml | 2 +-
.../com.python.pydev.analysis/META-INF/MANIFEST.MF | 2 +-
plugins/com.python.pydev.analysis/pom.xml | 2 +-
.../pydev/analysis/actions/PyGlobalsBrowser.java | 11 +-
.../META-INF/MANIFEST.MF | 2 +-
plugins/com.python.pydev.codecompletion/pom.xml | 2 +-
.../com.python.pydev.debug/META-INF/MANIFEST.MF | 2 +-
plugins/com.python.pydev.debug/pom.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
plugins/com.python.pydev.fastparser/pom.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
plugins/com.python.pydev.refactoring/pom.xml | 2 +-
.../markoccurrences/MarkOccurrencesJob.java | 58 +-
.../pydev/refactoring/refactorer/Refactorer.java | 23 +-
.../search/FindOccurrencesSearchQuery.java | 6 +-
.../wizards/rename/PyReferenceSearcher.java | 221 +
.../wizards/rename/PyRenameEntryPoint.java | 297 +-
.../rename/RefactoringRenameTestBase.java | 2 +-
.../rename/RenameModuleRefactoringTest.java | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
plugins/com.python.pydev.runalltests/pom.xml | 2 +-
plugins/com.python.pydev/META-INF/MANIFEST.MF | 2 +-
plugins/com.python.pydev/pom.xml | 2 +-
plugins/org.python.pydev.ast/META-INF/MANIFEST.MF | 2 +-
plugins/org.python.pydev.ast/pom.xml | 2 +-
plugins/org.python.pydev.core/META-INF/MANIFEST.MF | 2 +-
plugins/org.python.pydev.core/pom.xml | 2 +-
.../pydev/core/concurrency/ConditionEvent.java | 62 +
.../core/concurrency/ConditionEventWithValue.java | 68 +
.../META-INF/MANIFEST.MF | 2 +-
plugins/org.python.pydev.customizations/pom.xml | 2 +-
.../org.python.pydev.debug/META-INF/MANIFEST.MF | 2 +-
.../icons/breakmarker_django.png | Bin 0 -> 423 bytes
.../icons/breakmarker_django_gray.png | Bin 0 -> 384 bytes
plugins/org.python.pydev.debug/plugin.xml | 176 +-
plugins/org.python.pydev.debug/pom.xml | 2 +-
.../console/ConsoleCompletionsPageParticipant.java | 13 +-
.../pydev/debug/model/AbstractDebugTarget.java | 53 +-
.../org/python/pydev/debug/model/PyBreakpoint.java | 36 +-
.../debug/model/PyDebugModelPresentation.java | 29 +-
.../org/python/pydev/debug/model/PyReloadCode.java | 8 +-
.../python/pydev/debug/model/PySourceLocator.java | 13 +-
.../pydev/debug/model/PyStackFrameConsole.java | 2 +-
.../src/org/python/pydev/debug/model/XMLUtils.java | 34 +-
.../model/remote/AbstractDebuggerCommand.java | 47 +-
.../model/remote/EvaluateExpressionCommand.java | 4 +-
.../model/remote/RemoveBreakpointCommand.java | 11 +-
.../debug/model/remote/SetBreakpointCommand.java | 26 +-
.../SetDjangoExceptionBreakpointCommand.java | 20 +
.../pydev/debug/model/remote/VersionCommand.java | 11 +-
.../org/python/pydev/debug/ui/DebugPrefsPage.java | 11 +
.../pydev/debug/ui/IPyToggleBreakpointsTarget.java | 10 +
.../pydev/debug/ui/PyConfigureExceptionDialog.java | 15 +
.../pydev/debug/ui/PyToggleBreakpointsTarget.java | 14 +-
.../pydev/debug/ui/PyToggleTargetAdapter.java | 114 +
.../python/pydev/debug/ui/PythonSourceViewer.java | 82 +-
.../ui/actions/AbstractBreakpointRulerAction.java | 10 +-
.../debug/ui/actions/PyBreakpointRulerAction.java | 36 +-
.../debug/ui/launching/PythonRunnerConfig.java | 15 +
.../propertypages/BreakpointConditionEditor.java | 4 +-
.../ui/propertypages/PythonBreakpointPage.java | 16 +-
.../debug/newconsole/HandleBackspaceAction.java | 53 +-
.../pydev/debug/newconsole/PydevConsole.java | 36 +-
.../newconsole/PydevConsoleCommunication.java | 294 +-
.../debug/newconsole/PydevConsoleInterpreter.java | 23 +-
.../newconsole/PydevDebugConsoleCommunication.java | 42 +-
.../pydev/debug/codecoverage/XmlRpcTest.java | 26 +-
.../newconsole/PydevConsoleDebugCommsTest.java | 10 +-
.../org.python.pydev.django/META-INF/MANIFEST.MF | 2 +-
plugins/org.python.pydev.django/pom.xml | 2 +-
plugins/org.python.pydev.help/META-INF/MANIFEST.MF | 2 +-
plugins/org.python.pydev.help/pom.xml | 2 +-
.../org.python.pydev.jython/META-INF/MANIFEST.MF | 2 +-
plugins/org.python.pydev.jython/pom.xml | 2 +-
plugins/org.python.pydev.mylyn/pom.xml | 2 +-
.../org.python.pydev.parser/META-INF/MANIFEST.MF | 2 +-
plugins/org.python.pydev.parser/pom.xml | 2 +-
.../pydev/parser/grammar24/PythonGrammar24.java | 1 -
.../parser/grammar24/PythonGrammar24Constants.java | 157 +-
.../grammar24/PythonGrammar24TokenManager.java | 1299 +-
.../pydev/parser/grammar24/TreeBuilder24.java | 1 -
.../org/python/pydev/parser/grammar24/build.xml | 4 +-
.../org/python/pydev/parser/grammar24/python.jjt | 2433 ++-
.../pydev/parser/grammar24/python.jjt_template | 2 +-
.../pydev/parser/grammar25/PythonGrammar25.java | 13 +-
.../parser/grammar25/PythonGrammar25Constants.java | 158 +-
.../grammar25/PythonGrammar25TokenManager.java | 1289 +-
.../pydev/parser/grammar25/TreeBuilder25.java | 1 -
.../org/python/pydev/parser/grammar25/build.xml | 4 +-
.../org/python/pydev/parser/grammar25/python.jjt | 2603 ++-
.../pydev/parser/grammar25/python.jjt_template | 2 +-
.../pydev/parser/grammar26/PythonGrammar26.java | 1 -
.../parser/grammar26/PythonGrammar26Constants.java | 175 +-
.../grammar26/PythonGrammar26TokenManager.java | 1649 +-
.../pydev/parser/grammar26/TreeBuilder26.java | 1 -
.../org/python/pydev/parser/grammar26/build.xml | 4 +-
.../org/python/pydev/parser/grammar26/python.jjt | 2667 ++-
.../pydev/parser/grammar26/python.jjt_template | 2 +-
.../pydev/parser/grammar27/PythonGrammar27.java | 7 +-
.../parser/grammar27/PythonGrammar27Constants.java | 175 +-
.../grammar27/PythonGrammar27TokenManager.java | 1649 +-
.../pydev/parser/grammar27/TreeBuilder27.java | 1 -
.../org/python/pydev/parser/grammar27/build.xml | 4 +-
.../org/python/pydev/parser/grammar27/python.jjt | 2705 ++-
.../pydev/parser/grammar27/python.jjt_template | 2 +-
.../pydev/parser/grammar30/PythonGrammar30.java | 19444 ++++++++++---------
.../parser/grammar30/PythonGrammar30Constants.java | 849 +-
.../grammar30/PythonGrammar30TokenManager.java | 9259 ++++-----
.../pydev/parser/grammar30/TreeBuilder30.java | 1 -
.../org/python/pydev/parser/grammar30/build.xml | 4 +-
.../org/python/pydev/parser/grammar30/python.jjt | 21 +-
.../pydev/parser/grammar30/python.jjt_template | 2 +-
.../parser/grammarcommon/AbstractTokenManager.java | 18 +-
.../AbstractTokenManagerWithConstants.java | 426 +-
.../grammarcommon/DefaultPythonGrammarActions.java | 11 +-
.../pydev/parser/grammarcommon/IndentLevel.java | 40 +
.../pydev/parser/grammarcommon/make_replace.py | 19 +-
.../org/python/pydev/parser/PyParser27Test.java | 14 +
.../org/python/pydev/parser/PyParserTest.java | 4 +-
.../fastparser/FastDefinitionsParserTest.java | 8 +-
.../META-INF/MANIFEST.MF | 2 +-
plugins/org.python.pydev.refactoring/pom.xml | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
plugins/org.python.pydev.shared_core/pom.xml | 2 +-
.../callbacks/CallbackWithListeners.java | 5 +
.../callbacks/ICallbackWithListeners.java | 2 +
.../pydev/shared_core/process/ProcessUtils.java | 57 +-
.../pydev/shared_core/string/StringUtils.java | 54 +-
.../shared_core/process/ProcessUtilsTest.java | 33 +
.../META-INF/MANIFEST.MF | 2 +-
.../icons/interrupt.gif | Bin 0 -> 215 bytes
.../pom.xml | 2 +-
.../InteractiveConsolePlugin.java | 14 +-
.../console/IScriptConsoleCommunication.java | 25 +-
.../console/IScriptConsoleInterpreter.java | 15 +-
.../console/InterpreterResponse.java | 10 +-
.../console/ScriptConsolePrompt.java | 23 +-
.../console/ScriptXmlRpcClient.java | 57 +-
.../console/ui/IScriptConsoleSession.java | 6 +-
.../console/ui/ScriptConsole.java | 25 +-
.../console/ui/ScriptConsoleUIConstants.java | 4 +-
.../console/ui/internal/ICommandHandler.java | 7 +-
.../IScriptConsoleViewer2ForDocumentListener.java | 3 +
.../ui/internal/ScriptConsoleDocumentListener.java | 211 +-
.../console/ui/internal/ScriptConsoleMessages.java | 6 +-
.../ui/internal/ScriptConsoleMessages.properties | 4 +-
.../console/ui/internal/ScriptConsolePage.java | 13 +-
.../console/ui/internal/ScriptConsoleSession.java | 23 +-
.../console/ui/internal/ScriptConsoleViewer.java | 42 +-
.../actions/InterruptScriptConsoleAction.java | 44 +
.../META-INF/MANIFEST.MF | 2 +-
plugins/org.python.pydev.shared_ui/pom.xml | 2 +-
.../org/python/pydev/shared_ui/EditorUtils.java | 14 +
.../python/pydev/shared_ui/editor/BaseEditor.java | 70 +-
.../pydev/shared_ui/editor/BaseSourceViewer.java | 52 +-
.../python/pydev/shared_ui/outline/BaseModel.java | 36 +-
.../pydev/shared_ui/outline/BaseOutlinePage.java | 39 +-
.../pydev/shared_ui/outline/IOutlineModel.java | 10 +
.../pydev/shared_ui/outline/IParsedItem.java | 6 +
.../pydev/shared_ui/utils/PyMarkerUtils.java | 66 +-
.../pydev/overview_ruler/CopiedOverviewRuler.java | 173 +-
.../pydev/overview_ruler/MinimapOverviewRuler.java | 371 +-
.../MinimapOverviewRulerPreferencesPage.java | 30 +-
.../MinimapPreferenceInitializer.java | 12 +-
.../StyledTextWithoutVerticalBar.java | 23 +-
plugins/org.python.pydev/META-INF/MANIFEST.MF | 2 +-
plugins/org.python.pydev/pom.xml | 2 +-
plugins/org.python.pydev/pysrc/.project | 2 +-
.../.settings/org.eclipse.core.resources.prefs | 13 +-
plugins/org.python.pydev/pysrc/.travis.yml | 53 +
plugins/org.python.pydev/pysrc/LICENSE | 203 +
plugins/org.python.pydev/pysrc/README.md | 9 +
plugins/org.python.pydev/pysrc/_pydev_completer.py | 18 +-
.../pysrc/_pydev_imports_tipper.py | 138 +-
.../samples => _pydev_imps}/__init__.py | 0
.../pysrc/_pydev_imps/_pydev_BaseHTTPServer.py | 604 +
.../pysrc/_pydev_imps/_pydev_Queue.py | 245 +
.../{ => _pydev_imps}/_pydev_SimpleXMLRPCServer.py | 14 +-
.../pysrc/_pydev_imps/_pydev_SocketServer.py | 715 +
.../pysrc/{ => _pydev_imps}/_pydev_execfile.py | 0
.../pysrc/{ => _pydev_imps}/_pydev_inspect.py | 2 +-
.../pysrc/_pydev_imps/_pydev_select.py | 9 +
.../pysrc/_pydev_imps/_pydev_socket.py | 9 +
.../pysrc/_pydev_imps/_pydev_thread.py | 12 +
.../pysrc/_pydev_imps/_pydev_time.py | 9 +
.../pysrc/{ => _pydev_imps}/_pydev_xmlrpclib.py | 0
.../pysrc/_pydev_jy_imports_tipper.py | 165 +-
.../pysrc/_pydev_jython_execfile.py | 6 +
plugins/org.python.pydev/pysrc/_pydev_threading.py | 14 +
.../org.python.pydev/pysrc/_pydev_tipper_common.py | 29 +-
.../org.python.pydev/pysrc/_pydev_xmlrpc_hook.py | 74 -
plugins/org.python.pydev/pysrc/_pydevd_re.py | 11 -
plugins/org.python.pydev/pysrc/django_debug.py | 124 +
plugins/org.python.pydev/pysrc/django_frame.py | 132 +
plugins/org.python.pydev/pysrc/fix_getpass.py | 13 +
.../org.python.pydev/pysrc/merge_pydev_pycharm.txt | 150 +
plugins/org.python.pydev/pysrc/pycompletion.py | 6 +-
.../org.python.pydev/pysrc/pycompletionserver.py | 82 +-
.../org.python.pydev/pysrc/pydev_console_utils.py | 383 +-
plugins/org.python.pydev/pysrc/pydev_imports.py | 44 +-
.../pysrc/pydev_ipython/inputhookglut.py | 2 +-
.../pysrc/pydev_ipython/inputhookpyglet.py | 2 +-
.../pysrc/pydev_ipython/inputhookqt4.py | 2 +
.../pysrc/pydev_ipython/inputhookwx.py | 2 +-
.../pysrc/pydev_ipython_console.py | 63 +-
.../pysrc/pydev_ipython_console_010.py | 138 -
.../pysrc/pydev_ipython_console_011.py | 157 +-
plugins/org.python.pydev/pysrc/pydev_localhost.py | 20 +-
plugins/org.python.pydev/pysrc/pydev_log.py | 31 +
plugins/org.python.pydev/pysrc/pydev_monkey.py | 153 +-
plugins/org.python.pydev/pysrc/pydev_monkey_qt.py | 92 +
.../pysrc/pydev_runfiles_parallel.py | 9 +-
.../pysrc/pydev_runfiles_parallel_client.py | 103 +-
.../pysrc/pydev_runfiles_xml_rpc.py | 9 +-
plugins/org.python.pydev/pysrc/pydevconsole.py | 451 +-
plugins/org.python.pydev/pysrc/pydevd.py | 1355 +-
.../pysrc/pydevd_additional_thread_info.py | 59 +-
.../org.python.pydev/pysrc/pydevd_breakpoints.py | 156 +
plugins/org.python.pydev/pysrc/pydevd_comm.py | 494 +-
plugins/org.python.pydev/pysrc/pydevd_console.py | 56 +-
plugins/org.python.pydev/pysrc/pydevd_constants.py | 75 +-
.../org.python.pydev/pysrc/pydevd_custom_frames.py | 3 +-
.../org.python.pydev/pysrc/pydevd_file_utils.py | 195 +-
plugins/org.python.pydev/pysrc/pydevd_frame.py | 668 +-
plugins/org.python.pydev/pysrc/pydevd_io.py | 9 +-
plugins/org.python.pydev/pysrc/pydevd_referrers.py | 80 +-
plugins/org.python.pydev/pysrc/pydevd_resolver.py | 116 +-
.../org.python.pydev/pysrc/pydevd_save_locals.py | 11 +-
plugins/org.python.pydev/pysrc/pydevd_signature.py | 136 +
plugins/org.python.pydev/pysrc/pydevd_stackless.py | 7 +-
.../org.python.pydev/pysrc/pydevd_traceproperty.py | 16 +-
plugins/org.python.pydev/pysrc/pydevd_tracing.py | 34 +-
plugins/org.python.pydev/pysrc/pydevd_utils.py | 99 +
plugins/org.python.pydev/pysrc/pydevd_vars.py | 262 +-
plugins/org.python.pydev/pysrc/pydevd_xml.py | 234 +
plugins/org.python.pydev/pysrc/requirements.txt | 4 +
plugins/org.python.pydev/pysrc/runfiles.py | 7 +-
..._pydevconsole.py => test_check_pydevconsole.py} | 67 +-
.../pysrc/tests/test_get_referrers.py | 15 -
.../org.python.pydev/pysrc/tests/test_jyserver.py | 8 +
.../pysrc/tests/test_jysimpleTipper.py | 39 +-
.../pysrc/tests/test_pydev_ipython_010.py | 80 -
.../pysrc/tests/test_pydev_ipython_011.py | 225 +-
.../pysrc/tests/test_pydevconsole.py | 283 +-
.../org.python.pydev/pysrc/tests/test_pyserver.py | 22 +-
.../pysrc/tests/test_simpleTipper.py | 38 +-
.../pysrc/tests_mainloop/gui-glut.py | 80 +-
.../pysrc/tests_mainloop/gui-gtk.py | 49 +-
.../pysrc/tests_mainloop/gui-gtk3.py | 45 +-
.../pysrc/tests_mainloop/gui-pyglet.py | 35 +-
.../pysrc/tests_mainloop/gui-qt.py | 45 +-
.../pysrc/tests_mainloop/gui-tk.py | 44 +-
.../pysrc/tests_mainloop/gui-wx.py | 174 +-
.../pysrc/tests_python/_debugger_case18.py | 2 +-
.../pysrc/tests_python/_debugger_case19.py | 2 +-
.../pysrc/tests_python/_debugger_case7.py | 2 +-
.../pysrc/tests_python/_debugger_case89.py | 12 +-
.../pysrc/tests_python/_debugger_case_qthread1.py | 25 +
.../pysrc/tests_python/_debugger_case_qthread2.py | 32 +
.../pysrc/tests_python/_debugger_case_qthread3.py | 30 +
.../tests_python/test_additional_thread_info.py | 26 +-
.../pysrc/tests_python/test_debugger.py | 660 +-
.../pysrc/tests_python/test_pydev_monkey.py | 21 +-
.../pysrc/tests_python/test_save_locals.py | 6 +-
.../samples/not_in_default_pythonpath.txt | 1 +
.../pysrc/tests_runfiles/test_runfiles.py | 64 +-
.../src/org/python/pydev/editor/PyEdit.java | 85 +-
.../pydev/editor/PydevShowBrowserMessage.java | 53 +-
.../python/pydev/editor/actions/PyFormatStd.java | 61 +-
.../pydev/editor/codefolding/PyEditProjection.java | 43 +-
.../pydev/editor/codefolding/PySourceViewer.java | 25 +-
.../src/org/python/pydev/outline/ParsedItem.java | 9 +
.../src/org/python/pydev/outline/ParsedModel.java | 4 +-
.../org/python/pydev/outline/PyOutlinePage.java | 9 -
.../src/org/python/pydev/plugin/PydevPlugin.java | 62 +-
.../plugin/preferences/AbstractPydevPrefs.java | 6 +
.../plugin/preferences/PydevPrefsInitializer.java | 3 +
.../src/org/python/pydev/runners/SimpleRunner.java | 45 +-
.../PyCodeCompletionPreferencesPage.java | 2 +-
.../ScriptConsoleDocumentListenerTest.java | 16 +-
plugins/pom.xml | 2 +-
pom.xml | 2 +-
286 files changed, 36155 insertions(+), 25890 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-pydev.git
More information about the pkg-java-commits
mailing list