diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.addin b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.addin index 2e7a56c9a7..dd9fcd1f3e 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.addin +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.addin @@ -12,9 +12,7 @@ - - - + diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj index 1e2557020d..5c268c5178 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj @@ -76,7 +76,6 @@ - @@ -106,7 +105,6 @@ - diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IProcessRunner.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IProcessRunner.cs deleted file mode 100644 index b0be086579..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IProcessRunner.cs +++ /dev/null @@ -1,41 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using ICSharpCode.SharpDevelop.Util; - -namespace ICSharpCode.PythonBinding -{ - /// - /// Process runner interface. - /// - public interface IProcessRunner - { - /// - /// Triggered when a line of text is read from the standard output. - /// - event LineReceivedEventHandler OutputLineReceived; - - /// - /// Triggered when the process has exited. - /// - event EventHandler ProcessExited; - - /// - /// Starts the process. - /// - /// The process filename. - /// The command line arguments to - /// pass to the command. - void Start(string command, string arguments); - - /// - /// Kills the running process. - /// - void Kill(); - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonProcessRunner.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonProcessRunner.cs deleted file mode 100644 index f64d63eb34..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonProcessRunner.cs +++ /dev/null @@ -1,16 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using ICSharpCode.SharpDevelop.Util; - -namespace ICSharpCode.PythonBinding -{ - public class PythonProcessRunner : ProcessRunner, IProcessRunner - { - } -} diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/AddInFileTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/AddInFileTestFixture.cs index 7722d4b3c0..7a8d35911b 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/AddInFileTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/AddInFileTestFixture.cs @@ -38,7 +38,6 @@ namespace PythonBinding.Tests Codon languageBindingCodon; Codon projectFileFilterCodon; Codon codeCompletionBindingCodon; - LazyConditionEvaluator isPythonRunningConditionEvaluator; Codon applicationSettingsOptionsCodon; Codon buildEventsCodon; Codon compilingOptionsCodon; @@ -89,13 +88,7 @@ namespace PythonBinding.Tests // Get the PythonBinding runtime. foreach (Runtime runtime in addin.Runtimes) { if (runtime.Assembly == "PythonBinding.dll") { - pythonBindingRuntime = runtime; - - foreach (LazyConditionEvaluator conditionEvaluator in runtime.DefinedConditionEvaluators) { - if (conditionEvaluator.Name == "IsPythonRunning") { - isPythonRunningConditionEvaluator = conditionEvaluator; - } - } + pythonBindingRuntime = runtime; } else if (runtime.Assembly == "$ICSharpCode.FormsDesigner/FormsDesigner.dll") { formsDesignerRuntime = runtime; } @@ -141,18 +134,6 @@ namespace PythonBinding.Tests Assert.IsNotNull(pythonBindingRuntime); } - [Test] - public void IsPythonRunningConditionExists() - { - Assert.IsNotNull(isPythonRunningConditionEvaluator); - } - - [Test] - public void IsPythonRunningConditionClassName() - { - Assert.AreEqual("ICSharpCode.PythonBinding.IsPythonRunningCondition", isPythonRunningConditionEvaluator.ClassName); - } - [Test] public void FileFilterExists() { diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj index 0452c75a33..bdaf65f63c 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj @@ -362,7 +362,6 @@ - diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockProcessRunner.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockProcessRunner.cs deleted file mode 100644 index 62e4c3cb42..0000000000 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockProcessRunner.cs +++ /dev/null @@ -1,132 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.IO; -using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Util; - -namespace PythonBinding.Tests.Utils -{ - /// - /// Dummy IProcessRunner class. - /// - public class MockProcessRunner : IProcessRunner - { - string commandLine = String.Empty; - string outputText; - bool killCalled; - - /// - /// Triggered when a line of text is read from the standard output. - /// - public event LineReceivedEventHandler OutputLineReceived; - - /// - /// Triggered when the process has exited. - /// - public event EventHandler ProcessExited; - - public MockProcessRunner() - { - } - - /// - /// Starts the process. - /// - /// The process filename. - /// The command line arguments to - /// pass to the command. - public void Start(string command, string arguments) - { - commandLine = String.Concat(command, " ", arguments); - if (outputText != null) { - OnOutputLineReceived(); - } - } - - /// - /// Kills the running process. - /// - public void Kill() - { - killCalled = true; - } - - /// - /// Gets the full command line used with the process runner. - /// - public string CommandLine { - get { - return commandLine; - } - } - - /// - /// The string will be sent to any OutputLineReceived event - /// handler when the Start method is called. - /// - public string OutputText { - set { - outputText = value; - } - } - - /// - /// Raises the ProcessExited event. - /// - public void RaiseExitEvent() - { - OnProcessExited(new EventArgs()); - } - - /// - /// Indicates whether the Kill method was called. - /// - public bool KillCalled { - get { - return killCalled; - } - } - - /// - /// Raises the ProcessExited event. - /// - void OnProcessExited(EventArgs e) - { - if (ProcessExited != null) { - ProcessExited(this, e); - } - } - - /// - /// Raises the OutputLineReceived event. - /// - void OnOutputLineReceived(LineReceivedEventArgs e) - { - if (OutputLineReceived != null) { - OutputLineReceived(this, e); - } - } - - /// - /// Raises an event for each line in the output text. - /// - void OnOutputLineReceived() - { - using (StringReader reader = new StringReader(outputText)) { - string line; - do { - line = reader.ReadLine(); - if (line != null) { - OnOutputLineReceived(new LineReceivedEventArgs(line)); - } - } while (line != null); - } - } - } -}