From bf7f424b6599b6b662a69c63d5028263dcbee88b Mon Sep 17 00:00:00 2001 From: Amarchuk Date: Tue, 25 Feb 2014 16:46:32 +0400 Subject: [PATCH 1/2] fix problem with single quote in project path http://youtrack.jetbrains.com/issue/PY-10179 --- .../com/jetbrains/python/console/RunPythonConsoleAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/src/com/jetbrains/python/console/RunPythonConsoleAction.java b/python/src/com/jetbrains/python/console/RunPythonConsoleAction.java index c21288e1d004..9ee56201f631 100644 --- a/python/src/com/jetbrains/python/console/RunPythonConsoleAction.java +++ b/python/src/com/jetbrains/python/console/RunPythonConsoleAction.java @@ -222,7 +222,7 @@ public class RunPythonConsoleAction extends AnAction implements DumbAware { final String path = Joiner.on(", ").join(Collections2.transform(pythonPath, new Function() { @Override public String apply(String input) { - return "'" + input.replace("\\", "\\\\") + "'"; + return "'" + input.replace("\\", "\\\\").replace("'", "\\'") + "'"; } })); From 3d19968c081143250f644efafd93a2e3799263e5 Mon Sep 17 00:00:00 2001 From: Amarchuk Date: Tue, 25 Feb 2014 20:25:41 +0400 Subject: [PATCH 2/2] fix multi-line string with single quotes problem PY-12223 --- .../python/console/PydevConsoleExecuteActionHandler.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/python/src/com/jetbrains/python/console/PydevConsoleExecuteActionHandler.java b/python/src/com/jetbrains/python/console/PydevConsoleExecuteActionHandler.java index 809d957b7be1..912b6e06147d 100644 --- a/python/src/com/jetbrains/python/console/PydevConsoleExecuteActionHandler.java +++ b/python/src/com/jetbrains/python/console/PydevConsoleExecuteActionHandler.java @@ -137,13 +137,12 @@ public class PydevConsoleExecuteActionHandler extends ConsoleExecuteActionHandle // multiline strings handling if (myInMultilineStringState != null) { - if (PyConsoleUtil.isDoubleQuoteMultilineStarts(line)) { + if (PyConsoleUtil.isDoubleQuoteMultilineStarts(line) || PyConsoleUtil.isSingleQuoteMultilineStarts(line)) { myInMultilineStringState = null; // restore language console.setLanguage(PythonLanguage.getInstance()); console.setPrompt(PyConsoleUtil.ORDINARY_PROMPT); - } - else { + } else { return; } }