Updated to IronPython 2.6 RC1

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@5021 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/BackendBindings/Python/PyWalker/PyWalker.csproj

@@ -43,6 +43,9 @@
     <Reference Include="IronPython.Modules">
       <HintPath>..\RequiredLibraries\IronPython.Modules.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Dynamic">
+      <HintPath>..\RequiredLibraries\Microsoft.Dynamic.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Scripting">
       <HintPath>..\RequiredLibraries\Microsoft.Scripting.dll</HintPath>
     </Reference>

src/AddIns/BackendBindings/Python/PyWalker/ResolveWalker.cs

@@ -78,10 +78,10 @@ namespace PyWalker
 		
 		public override bool Walk(ClassDefinition node)
 		{
-			if (node.Bases.Length > 0) {
+			if (node.Bases.Count > 0) {
-				writer.WriteLine("Class: " + node.Name.ToString() + " BaseTypes: " + GetBaseTypes(node.Bases));
+				writer.WriteLine("Class: " + node.Name + " BaseTypes: " + GetBaseTypes(node.Bases));
 			} else {
-				writer.WriteLine("Class: " + node.Name.ToString());
+				writer.WriteLine("Class: " + node.Name);
 			}
 			return base.Walk(node);
 		}

src/AddIns/BackendBindings/Python/Python.Build.Tasks/Project/Python.Build.Tasks.csproj

@@ -49,6 +49,9 @@
     <Reference Include="Microsoft.Build.Utilities.v3.5">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
+    <Reference Include="Microsoft.Dynamic">
+      <HintPath>..\..\RequiredLibraries\Microsoft.Dynamic.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Scripting">
       <HintPath>..\..\RequiredLibraries\Microsoft.Scripting.dll</HintPath>
     </Reference>

src/AddIns/BackendBindings/Python/Python.Build.Tasks/Project/Src/PythonCompiler.cs

@@ -96,8 +96,8 @@ namespace ICSharpCode.Python.Build.Tasks
 			
 			// Compile the source files to a dll first.
 			ScriptEngine engine = IronPython.Hosting.Python.CreateEngine();
-			PythonDictionary dictionary = new PythonDictionary();
+			Dictionary<string, object> dictionary = new Dictionary<string, object>();
-			dictionary.setdefault("mainModule", mainFile);
+			dictionary.Add("mainModule", mainFile);
 			string outputAssemblyDll = Path.ChangeExtension(outputAssembly, ".dll");
 			ClrModule.CompileModules(DefaultContext.Default, outputAssemblyDll, dictionary, ToStringArray(sourceFiles));
 	

src/AddIns/BackendBindings/Python/Python.Build.Tasks/Test/Python.Build.Tasks.Tests.csproj

@@ -47,6 +47,9 @@
     <Reference Include="Microsoft.Build.Utilities.v3.5">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
+    <Reference Include="Microsoft.Dynamic">
+      <HintPath>..\..\RequiredLibraries\Microsoft.Dynamic.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Scripting">
       <HintPath>..\..\RequiredLibraries\Microsoft.Scripting.dll</HintPath>
     </Reference>

src/AddIns/BackendBindings/Python/PythonBinding/Project/Lib/__future__.py

@@ -13,7 +13,13 @@
 #
 #####################################################################################
 
+all_feature_names = ['nested_scopes', 'generators', 'division', 
+                     'absolute_import', 'with_statement', 'print_function', 
+                     'unicode_literals']
+
 division=1
 with_statement=1
 generators=1
 absolute_import=1
+print_function=1
+unicode_literals=1

src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj

@@ -46,6 +46,9 @@
     <Reference Include="IronPython.Modules">
       <HintPath>..\..\RequiredLibraries\IronPython.Modules.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Dynamic">
+      <HintPath>..\..\RequiredLibraries\Microsoft.Dynamic.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Scripting">
       <HintPath>..\..\RequiredLibraries\Microsoft.Scripting.dll</HintPath>
     </Reference>

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonAstWalker.cs

@@ -79,6 +79,10 @@ namespace ICSharpCode.PythonBinding
 		/// </summary>
 		public override bool Walk(FunctionDefinition node)
 		{
+			if (node.Body == null) {
+				return true;
+			}
+			
 			bool ignoreFirstMethodParameter = true;
 			IClass c = currentClass;
 			if (currentClass == null) {
@@ -89,7 +93,7 @@ namespace ICSharpCode.PythonBinding
 			}
 
 			// Create method.
-			string methodName = node.Name.ToString();
+			string methodName = node.Name;
 			DomRegion bodyRegion = GetBodyRegion(node.Body, node.Header);
 			DomRegion region = GetMethodRegion(node);
 			
@@ -167,7 +171,7 @@ namespace ICSharpCode.PythonBinding
 				NameExpression nameExpression = expression as NameExpression;
 				MemberExpression memberExpression = expression as MemberExpression;
 				if (nameExpression != null) {
-					AddBaseType(c, nameExpression.Name.ToString());
+					AddBaseType(c, nameExpression.Name);
 				} else if (memberExpression != null) {
 					AddBaseType(c, PythonControlFieldExpression.GetMemberName(memberExpression));
 				}
@@ -187,7 +191,7 @@ namespace ICSharpCode.PythonBinding
 		/// </summary>
 		/// <remarks>If the parameters belong to a class method then the first
 		/// "self" parameter can be ignored.</remarks>
-		IParameter[] ConvertParameters(Parameter[] parameters, bool ignoreFirstParameter)
+		IParameter[] ConvertParameters(IList<Parameter> parameters, bool ignoreFirstParameter)
 		{
 			List<IParameter> convertedParameters = new List<IParameter>();
 
@@ -196,8 +200,8 @@ namespace ICSharpCode.PythonBinding
 				startingIndex = 1;
 			}
 			
-			for (int i = startingIndex; i < parameters.Length; ++i) {				
+			for (int i = startingIndex; i < parameters.Count; ++i) {				
-				DefaultParameter parameter = new DefaultParameter(parameters[i].Name.ToString(), null, new DomRegion());
+				DefaultParameter parameter = new DefaultParameter(parameters[i].Name, null, new DomRegion());
 				convertedParameters.Add(parameter);
 			}
 			return convertedParameters.ToArray();
@@ -209,7 +213,7 @@ namespace ICSharpCode.PythonBinding
 		/// </summary>
 		string GetFullyQualifiedClassName(ClassDefinition classDef)
 		{
-			return String.Concat(ns, ".", classDef.Name.ToString());
+			return String.Concat(ns, ".", classDef.Name);
 		}
 		
 		/// <summary>

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonCodeDeserializer.cs

@@ -129,7 +129,7 @@ namespace ICSharpCode.PythonBinding
 		/// </summary>
 		object Deserialize(NameExpression nameExpression)
 		{
-			string name = nameExpression.Name.ToString();
+			string name = nameExpression.Name;
 			if ("self" == name.ToLowerInvariant()) {
 				return componentCreator.RootComponent;
 			} else {
@@ -157,8 +157,8 @@ namespace ICSharpCode.PythonBinding
 			ListExpression list = callExpression.Args[0].Expression as ListExpression;
 			MemberExpression arrayTypeMemberExpression = target.Index as MemberExpression;
 			Type arrayType = componentCreator.GetType(PythonControlFieldExpression.GetMemberName(arrayTypeMemberExpression));
-			Array array = Array.CreateInstance(arrayType, list.Items.Length);
+			Array array = Array.CreateInstance(arrayType, list.Items.Count);
-			for (int i = 0; i < list.Items.Length; ++i) {
+			for (int i = 0; i < list.Items.Count; ++i) {
 				Expression listItemExpression = list.Items[i];
 				ConstantExpression constantExpression = listItemExpression as ConstantExpression;
 				MemberExpression memberExpression = listItemExpression as MemberExpression;
@@ -167,10 +167,10 @@ namespace ICSharpCode.PythonBinding
 				if (constantExpression != null) {
 					array.SetValue(constantExpression.Value, i);
 				} else if (memberExpression != null) {
-					string name = PythonControlFieldExpression.GetVariableName(memberExpression.Name.ToString());
+					string name = PythonControlFieldExpression.GetVariableName(memberExpression.Name);
 					array.SetValue(componentCreator.GetComponent(name), i);
 				} else if (nameExpression != null) {
-					array.SetValue(componentCreator.GetInstance(nameExpression.Name.ToString()), i);
+					array.SetValue(componentCreator.GetInstance(nameExpression.Name), i);
 				} else if (listItemCallExpression != null) {
 					object instance = componentCreator.CreateInstance(arrayType, GetArguments(listItemCallExpression), null, false);
 					array.SetValue(instance, i);
@@ -191,7 +191,7 @@ namespace ICSharpCode.PythonBinding
 			if (type != null) {
 				foreach (MethodInfo method in type.GetMethods(BindingFlags.Public | BindingFlags.Static)) {
 					if (method.Name == field.MemberName) {
-						if (method.GetParameters().Length == callExpression.Args.Length) {
+						if (method.GetParameters().Length == callExpression.Args.Count) {
 							return method.Invoke(null, GetArguments(callExpression).ToArray());
 						}
 					}

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonComponentWalker.cs

@@ -61,12 +61,12 @@ namespace ICSharpCode.PythonBinding
 		/// </summary>
 		public static string GetBaseClassName(ClassDefinition classDefinition)
 		{
-			if (classDefinition.Bases.Length > 0) {
+			if (classDefinition.Bases.Count > 0) {
 				Expression baseClassExpression = classDefinition.Bases[0];
 				NameExpression nameExpression = baseClassExpression as NameExpression;
 				MemberExpression memberExpression = baseClassExpression as MemberExpression;
 				if (nameExpression != null) {
-					return nameExpression.Name.ToString();
+					return nameExpression.Name;
 				}
 				return PythonControlFieldExpression.GetMemberName(memberExpression);
 			}
@@ -76,7 +76,7 @@ namespace ICSharpCode.PythonBinding
 		public override bool Walk(ClassDefinition node)
 		{
 			classDefinition = node;
-			componentName = node.Name.ToString();
+			componentName = node.Name;
 			if (node.Body != null) {
 				node.Body.Walk(this);
 			}

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonControlFieldExpression.cs

@@ -164,13 +164,13 @@ namespace ICSharpCode.PythonBinding
 		{
 			List<string> names = new List<string>();
 			while (expression != null) {
-				names.Insert(0, expression.Name.ToString());
+				names.Insert(0, expression.Name);
 				
 				NameExpression nameExpression = expression.Target as NameExpression;
 				expression = expression.Target as MemberExpression;
 				if (expression == null) {
 					if (nameExpression != null) {
-						names.Insert(0, nameExpression.Name.ToString());
+						names.Insert(0, nameExpression.Name);
 					}
 				}
 			}
@@ -273,7 +273,7 @@ namespace ICSharpCode.PythonBinding
 			object component = GetComponent(componentCreator);
 			PropertyDescriptor property = GetProperty(component, memberName);
 			if (property != null) {
-				string name = nameExpression.Name.ToString();
+				string name = nameExpression.Name;
 				if (property.PropertyType != typeof(bool)) {
 					object instance = componentCreator.GetInstance(name);
 					if (instance != null) {

src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonVariableResolver.cs

@@ -73,7 +73,7 @@ namespace ICSharpCode.PythonBinding
 		public override bool Walk(NameExpression node)
 		{
 			if (currentAssignStatement != null) {
-				string nodeName = node.Name.ToString();
+				string nodeName = node.Name;
 				if (nodeName == variableName) {
 					foundVariableAssignment = true;
 				}
@@ -119,14 +119,14 @@ namespace ICSharpCode.PythonBinding
 			do {
 				nameExpression = node as NameExpression;
 				MemberExpression memberExpression = node as MemberExpression;
-				SymbolId symbol = new SymbolId(0);
+				string name = String.Empty;
 				if (memberExpression != null) {
-					symbol = memberExpression.Name;
+					name = memberExpression.Name;
 					node = memberExpression.Target;
 				} else if (nameExpression != null) {
-					symbol = nameExpression.Name;
+					name = nameExpression.Name;
 				}
-				names.Add(symbol.ToString());
+				names.Add(name);
 			} while (nameExpression == null);
 			
 			// Create the fully qualified type name by adding the names

src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/MissingInitializeComponentMethodTestFixture.cs

@@ -53,7 +53,7 @@ namespace PythonBinding.Tests.Designer
 		[Test]
 		public void ClassWithNoBody()
 		{
-			ClassDefinition classDef = new ClassDefinition(new SymbolId(10), null, null);
+			ClassDefinition classDef = new ClassDefinition("classWithNoBody", null, null);
 			PythonComponentWalker walker = new PythonComponentWalker(this);
 			walker.Walk(classDef);
 		}

src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/InvalidCastInPythonParserTestFixture.cs

@@ -15,7 +15,7 @@ using PythonBinding.Tests;
 namespace PythonBinding.Tests.Parsing
 {
 	/// <summary>
-	/// The IronPython parser will throw an invalid cast exception for the following code:
+	/// The IronPython 2.0.2 parser will throw an invalid cast exception for the following code:
 	/// 
 	/// class Project(id): 
 	///     def __init__ Project_ID(): 
@@ -31,6 +31,8 @@ namespace PythonBinding.Tests.Parsing
     /// at IronPython.Compiler.Parser.ParseStmt()
     /// at IronPython.Compiler.Parser.ParseFile(Boolean makeModule)
     /// at ICSharpCode.PythonBinding.PythonParser.CreateAst(String fileName, String fileContent)
+    /// 
+    /// This test just ensures that this bug is fixed with IronPython 2.6
 	/// </summary>
 	[TestFixture]
 	public class InvalidCastInPythonParserTestFixture
@@ -40,11 +42,10 @@ namespace PythonBinding.Tests.Parsing
 					  "        #i\r\n";
 		
 		/// <summary>
-		/// Check that IronPython bug still exists.
+		/// Check that IronPython bug has been fixed exists.
 		/// </summary>
 		[Test]
-		[ExpectedException(typeof(InvalidCastException))]
+		public void CreateAstShouldNotThrowInvalidCastException()
-		public void CreateAstShouldThrowInvalidCastException()
 		{
 			PythonParser parser = new PythonParser();
 			PythonAst ast = parser.CreateAst(@"d:\projects\test\test.py", code);
@@ -55,7 +56,7 @@ namespace PythonBinding.Tests.Parsing
 		{
 			PythonParser parser = new PythonParser();
 			ICompilationUnit unit = parser.Parse(new DefaultProjectContent(), @"d:\projects\test\test.py", code);
-			Assert.AreEqual(0, unit.Classes.Count);
+			Assert.AreEqual(1, unit.Classes.Count);
 		}
 	}
 }

src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj

@@ -47,6 +47,9 @@
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.Build.Tasks" />
     <Reference Include="Microsoft.Build.Utilities" />
+    <Reference Include="Microsoft.Dynamic">
+      <HintPath>..\..\RequiredLibraries\Microsoft.Dynamic.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Scripting">
       <HintPath>..\..\RequiredLibraries\Microsoft.Scripting.dll</HintPath>
     </Reference>

src/Setup/Files.wxs

@@ -1305,6 +1305,18 @@
 												<File Source="..\..\AddIns\AddIns\BackendBindings\PythonBinding\Lib\__future__.py" Name="__future__.py" Id="__future__.py" KeyPath="yes" />
 											</Component>
 										</Directory>
+										<Component Guid="694B49D9-3EDA-4B3E-AE21-C4462A99ED0D" Id="IronPythonModulesXml" DiskId="1">
+											<File Source="..\..\AddIns\AddIns\BackendBindings\PythonBinding\IronPython.Modules.xml" Name="IronPython.Modules.xml" Id="IronPython.Modules.xml" KeyPath="yes" />
+										</Component>
+										<Component Guid="0234CFCB-0064-4D59-B39F-0C33735C9B5B" Id="IronPythonXml" DiskId="1">
+											<File Source="..\..\AddIns\AddIns\BackendBindings\PythonBinding\IronPython.xml" Name="IronPython.xml" Id="IronPython.xml" KeyPath="yes" />
+										</Component>
+										<Component Guid="6E1D93BF-A105-4526-8BA0-13B69EEB1360" Id="MicrosoftDynamicDll" DiskId="1">
+											<File Source="..\..\AddIns\AddIns\BackendBindings\PythonBinding\Microsoft.Dynamic.dll" Name="Microsoft.Dynamic.dll" Id="Microsoft.Dynamic.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="Microsoft.Dynamic.dll" AssemblyManifest="Microsoft.Dynamic.dll" />
+										</Component>
+										<Component Guid="8A1A4691-E6BD-451F-AA5D-BE9C716D56A0" Id="MicrosoftScriptingDebuggingDll" DiskId="1">
+											<File Source="..\..\AddIns\AddIns\BackendBindings\PythonBinding\Microsoft.Scripting.Debugging.dll" Name="Microsoft.Scripting.Debugging.dll" Id="Microsoft.Scripting.Debugging.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="Microsoft.Scripting.Debugging.dll" AssemblyManifest="Microsoft.Scripting.Debugging.dll" />
+										</Component>
 									</Directory>
 									<Directory Id="FSharpBinding" Name="FSharpBinding">
 										<Component Guid="6B4F28AF-133C-4FEB-98DB-67A5405AEB12" Id="FSharpBindingAddin" DiskId="1">

src/Setup/Setup.wxs

@@ -141,7 +141,7 @@
 			each be a feature if the user wants to heavily customise the installation.
 		-->
 		<Feature Id="Complete"
-		         Title="SharpDevelop 3.1"
+		         Title="SharpDevelop 3.1.1"
 		         Description="Installs SharpDevelop and registers file associations"
 		         Level="1"
 		         ConfigurableDirectory="INSTALLDIR"
@@ -404,7 +404,8 @@
 				<ComponentRef Id="PartCoverExe"/>
 				<ComponentRef Id="PartCoverExeConfig"/>
 				<ComponentRef Id="PartCoverFrameworkDll"/>
-				<ComponentRef Id="PartCoverToNCoverXslt"/>		
+				<ComponentRef Id="PartCoverToNCoverXslt"/>
+				
 				<ComponentRef Id="PythonConsoleProjectTemplate"/>	
 				<ComponentRef Id="PythonEmptyClassTemplate"/>	
 				<ComponentRef Id="PythonEmptyFormTemplate"/>	
@@ -414,10 +415,14 @@
 				<ComponentRef Id="PythonLibraryProjectTemplate"/>	
 				<ComponentRef Id="IpyExe"/>	
 				<ComponentRef Id="IronPythonModulesDll"/>	
+				<ComponentRef Id="IronPythonModulesXml"/>	
 				<ComponentRef Id="IronPythonDll"/>	
+				<ComponentRef Id="IronPythonXml"/>	
+				<ComponentRef Id="MicrosoftDynamicDll"/>
 				<ComponentRef Id="MicrosoftScriptingDll"/>	
 				<ComponentRef Id="MicrosoftScriptingCoreDll"/>	
-				<ComponentRef Id="MicrosoftScriptingExtensionAttributeDll"/>	
+				<ComponentRef Id="MicrosoftScriptingDebuggingDll"/>	
+				<ComponentRef Id="MicrosoftScriptingExtensionAttributeDll"/>				
 				<ComponentRef Id="PythonBuildTasksDll"/>	
 				<ComponentRef Id="PythonBindingAddin"/>	
 				<ComponentRef Id="PythonBindingDll"/>