Remove unused using from testing and format

vmuriart · vmuriart · commit 907a6339958f · 2017-01-22T21:53:43.000-07:00
diff --git a/src/testing/arraytest.cs b/src/testing/arraytest.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections;
-
 namespace Python.Test
 {
     //========================================================================
@@ -318,4 +315,4 @@ public static Spam[][] EchoRangeAA(Spam[][] items)
             return items;
         }
     }
-}
+}
diff --git a/src/testing/callbacktest.cs b/src/testing/callbacktest.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using Python.Runtime;
 
 namespace Python.Test
 {
@@ -13,32 +10,33 @@ public class CallbackTest
     {
         public string Call_simpleDefaultArg_WithNull(string moduleName)
         {
-            using (Runtime.Py.GIL())
+            using (Py.GIL())
             {
-                dynamic module = Runtime.Py.Import(moduleName);
+                dynamic module = Py.Import(moduleName);
                 return module.simpleDefaultArg(null);
             }
         }
+
         public string Call_simpleDefaultArg_WithEmptyArgs(string moduleName)
         {
-            using (Runtime.Py.GIL())
+            using (Py.GIL())
             {
-                dynamic module = Runtime.Py.Import(moduleName);
+                dynamic module = Py.Import(moduleName);
                 return module.simpleDefaultArg();
             }
         }
     }
 
     //==========================================================================
     // Tests calling from Python into C# and back into Python using a PyObject.
-    // SelfCallbackTest should be inherited by a Python class. 
+    // SelfCallbackTest should be inherited by a Python class.
     // Used in test_class.py / testCallback
     //==========================================================================
     public class SelfCallbackTest
     {
-        public void Callback(Runtime.PyObject self)
+        public void Callback(PyObject self)
         {
-            using (Runtime.Py.GIL())
+            using (Py.GIL())
                 ((dynamic)self).PyCallback(self);
         }
     }
diff --git a/src/testing/classtest.cs b/src/testing/classtest.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections;
 
 namespace Python.Test
@@ -61,4 +60,4 @@ public ClassCtorTest2(string v)
     internal class InternalClass
     {
     }
-}
+}
diff --git a/src/testing/constructortests.cs b/src/testing/constructortests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.IO;
 
 namespace Python.Test
@@ -50,4 +49,4 @@ public SubclassConstructorTest(Exception v)
             this.value = v;
         }
     }
-}
+}
diff --git a/src/testing/conversiontest.cs b/src/testing/conversiontest.cs
@@ -1,6 +1,3 @@
-using System;
-
-
 namespace Python.Test
 {
     //========================================================================
@@ -58,4 +55,4 @@ public string GetValue()
             return value;
         }
     }
-}
+}
diff --git a/src/testing/delegatetest.cs b/src/testing/delegatetest.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Python.Test
 {
     //========================================================================
@@ -60,4 +58,4 @@ public bool CallBoolDelegate(BoolDelegate d)
             return d();
         }
     }
-}
+}
diff --git a/src/testing/doctest.cs b/src/testing/doctest.cs
@@ -8,19 +8,19 @@ namespace Python.Test
 
     // Classes with a constructor have their docstring set to the ctor signature.
     // Test if a class has an explicit doc string it gets set correctly.
-    [DocStringAttribute("DocWithCtorTest Class")]
+    [DocString("DocWithCtorTest Class")]
     public class DocWithCtorTest
     {
         public DocWithCtorTest()
         {
         }
 
-        [DocStringAttribute("DocWithCtorTest TestMethod")]
+        [DocString("DocWithCtorTest TestMethod")]
         public void TestMethod()
         {
         }
 
-        [DocStringAttribute("DocWithCtorTest StaticTestMethod")]
+        [DocString("DocWithCtorTest StaticTestMethod")]
         public static void StaticTestMethod()
         {
         }
@@ -41,17 +41,17 @@ public static void StaticTestMethod(double a, int b)
         }
     }
 
-    [DocStringAttribute("DocWithoutCtorTest Class")]
+    [DocString("DocWithoutCtorTest Class")]
     public class DocWithoutCtorTest
     {
-        [DocStringAttribute("DocWithoutCtorTest TestMethod")]
+        [DocString("DocWithoutCtorTest TestMethod")]
         public void TestMethod()
         {
         }
 
-        [DocStringAttribute("DocWithoutCtorTest StaticTestMethod")]
+        [DocString("DocWithoutCtorTest StaticTestMethod")]
         public static void StaticTestMethod()
         {
         }
     }
-}
+}
diff --git a/src/testing/enumtest.cs b/src/testing/enumtest.cs
@@ -86,7 +86,7 @@ public enum ULongEnum : ulong
         Five
     }
 
-    [FlagsAttribute]
+    [Flags]
     public enum FlagsEnum
     {
         Zero,
@@ -96,4 +96,4 @@ public enum FlagsEnum
         Four,
         Five
     }
-}
+}
diff --git a/src/testing/exceptiontest.cs b/src/testing/exceptiontest.cs
@@ -99,4 +99,4 @@ public string GetExtraInfo()
             return extra;
         }
     }
-}
+}
diff --git a/src/testing/fieldtest.cs b/src/testing/fieldtest.cs
@@ -1,6 +1,3 @@
-using System;
-
-
 namespace Python.Test
 {
     //========================================================================
@@ -54,4 +51,4 @@ public void Shutup()
         public object ObjectField;
         public ISpam SpamField;
     }
-}
+}
diff --git a/src/testing/generictest.cs b/src/testing/generictest.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections;
-
 namespace Python.Test
 {
     //========================================================================
@@ -131,4 +128,4 @@ public static string Overloaded<Q>(int arg1, int arg2, string arg3)
             return arg3;
         }
     }
-}
+}
diff --git a/src/testing/globaltest.cs b/src/testing/globaltest.cs
@@ -1,9 +1,7 @@
-using System;
-
 //========================================================================
 // Supports units tests for access to types without a namespace.
 //========================================================================
 
 public class NoNamespaceType
 {
-}
+}
diff --git a/src/testing/indexertest.cs b/src/testing/indexertest.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections;
 
 namespace Python.Test
@@ -415,4 +414,4 @@ public MultiDefaultKeyIndexerTest() : base()
             }
         }
     }
-}
+}
diff --git a/src/testing/interfacetest.cs b/src/testing/interfacetest.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Python.Test
 {
     //========================================================================
@@ -62,4 +60,4 @@ private interface IPrivate
         {
         }
     }
-}
+}
diff --git a/src/testing/methodtest.cs b/src/testing/methodtest.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Collections.Generic;
 
 namespace Python.Test
 {
@@ -156,13 +155,13 @@ public static bool TestValueRefParams(string s, ref int i1)
 
         public static bool TestObjectOutParams(object o, out object o1)
         {
-            o1 = new System.Exception("test");
+            o1 = new Exception("test");
             return true;
         }
 
         public static bool TestObjectRefParams(object o, ref object o1)
         {
-            o1 = new System.Exception("test");
+            o1 = new Exception("test");
             return true;
         }
 
@@ -630,4 +629,4 @@ public string PublicMethod(string echo)
             return echo;
         }
     }
-}
+}
diff --git a/src/testing/moduletest.cs b/src/testing/moduletest.cs
@@ -1,16 +1,20 @@
 using System;
 using System.Threading;
 
-namespace Python.Test {
-    public class ModuleTest {
+namespace Python.Test
+{
+    public class ModuleTest
+    {
         private static Thread _thread;
 
         public static void RunThreads()
         {
-            _thread = new Thread(() => {
+            _thread = new Thread(() =>
+            {
                 var appdomain = AppDomain.CurrentDomain;
                 var assemblies = appdomain.GetAssemblies();
-                foreach (var assembly in assemblies) {
+                foreach (var assembly in assemblies)
+                {
                     assembly.GetTypes();
                 }
             });
diff --git a/src/testing/propertytest.cs b/src/testing/propertytest.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Python.Test
 {
     //========================================================================
@@ -84,4 +82,4 @@ public ShortEnum EnumProperty
             set { _enum_property = value; }
         }
     }
-}
+}
diff --git a/src/testing/subclasstest.cs b/src/testing/subclasstest.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Python.Test
 {
@@ -70,7 +68,6 @@ public class SubClass : RecursiveInheritance
         {
             public void SomeMethod()
             {
-
             }
         }
     }
diff --git a/src/testing/threadtest.cs b/src/testing/threadtest.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using Python.Runtime;
 
 namespace Python.Test
@@ -77,4 +76,4 @@ public static string CallEchoString2(string arg)
             }
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,3 @@`
`1`		`-using System;`
`2`		`-using System.Collections;`
`3`		`-`
`4`	`1`	`namespace Python.Test`
`5`	`2`	`{`
`6`	`3`	`//========================================================================`
`@@ -318,4 +315,4 @@ public static Spam[][] EchoRangeAA(Spam[][] items)`
`318`	`315`	`return items;`
`319`	`316`	`}`
`320`	`317`	`}`
`321`		`-}`
	`318`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Text;`
	`1`	`+using Python.Runtime;`
`5`	`2`
`6`	`3`	`namespace Python.Test`
`7`	`4`	`{`
`@@ -13,32 +10,33 @@ public class CallbackTest`
`13`	`10`	`{`
`14`	`11`	`public string Call_simpleDefaultArg_WithNull(string moduleName)`
`15`	`12`	`{`
`16`		`- using (Runtime.Py.GIL())`
	`13`	`+ using (Py.GIL())`
`17`	`14`	`{`
`18`		`- dynamic module = Runtime.Py.Import(moduleName);`
	`15`	`+ dynamic module = Py.Import(moduleName);`
`19`	`16`	`return module.simpleDefaultArg(null);`
`20`	`17`	`}`
`21`	`18`	`}`
	`19`	`+`
`22`	`20`	`public string Call_simpleDefaultArg_WithEmptyArgs(string moduleName)`
`23`	`21`	`{`
`24`		`- using (Runtime.Py.GIL())`
	`22`	`+ using (Py.GIL())`
`25`	`23`	`{`
`26`		`- dynamic module = Runtime.Py.Import(moduleName);`
	`24`	`+ dynamic module = Py.Import(moduleName);`
`27`	`25`	`return module.simpleDefaultArg();`
`28`	`26`	`}`
`29`	`27`	`}`
`30`	`28`	`}`
`31`	`29`
`32`	`30`	`//==========================================================================`
`33`	`31`	`// Tests calling from Python into C# and back into Python using a PyObject.`
`34`		`- // SelfCallbackTest should be inherited by a Python class.`
	`32`	`+ // SelfCallbackTest should be inherited by a Python class.`
`35`	`33`	`// Used in test_class.py / testCallback`
`36`	`34`	`//==========================================================================`
`37`	`35`	`public class SelfCallbackTest`
`38`	`36`	`{`
`39`		`- public void Callback(Runtime.PyObject self)`
	`37`	`+ public void Callback(PyObject self)`
`40`	`38`	`{`
`41`		`- using (Runtime.Py.GIL())`
	`39`	`+ using (Py.GIL())`
`42`	`40`	`((dynamic)self).PyCallback(self);`
`43`	`41`	`}`
`44`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using System;`
`2`	`1`	`using System.Collections;`
`3`	`2`
`4`	`3`	`namespace Python.Test`
`@@ -61,4 +60,4 @@ public ClassCtorTest2(string v)`
`61`	`60`	`internal class InternalClass`
`62`	`61`	`{`
`63`	`62`	`}`
`64`		`-}`
	`63`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections;`
`3`	`2`	`using System.IO;`
`4`	`3`
`5`	`4`	`namespace Python.Test`
`@@ -50,4 +49,4 @@ public SubclassConstructorTest(Exception v)`
`50`	`49`	`this.value = v;`
`51`	`50`	`}`
`52`	`51`	`}`
`53`		`-}`
	`52`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-using System;`
`2`		`-`
`3`	`1`	`namespace Python.Test`
`4`	`2`	`{`
`5`	`3`	`//========================================================================`
`@@ -60,4 +58,4 @@ public bool CallBoolDelegate(BoolDelegate d)`
`60`	`58`	`return d();`
`61`	`59`	`}`
`62`	`60`	`}`
`63`		`-}`
	`61`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -8,19 +8,19 @@ namespace Python.Test`
`8`	`8`
`9`	`9`	`// Classes with a constructor have their docstring set to the ctor signature.`
`10`	`10`	`// Test if a class has an explicit doc string it gets set correctly.`
`11`		`- [DocStringAttribute("DocWithCtorTest Class")]`
	`11`	`+ [DocString("DocWithCtorTest Class")]`
`12`	`12`	`public class DocWithCtorTest`
`13`	`13`	`{`
`14`	`14`	`public DocWithCtorTest()`
`15`	`15`	`{`
`16`	`16`	`}`
`17`	`17`
`18`		`- [DocStringAttribute("DocWithCtorTest TestMethod")]`
	`18`	`+ [DocString("DocWithCtorTest TestMethod")]`
`19`	`19`	`public void TestMethod()`
`20`	`20`	`{`
`21`	`21`	`}`
`22`	`22`
`23`		`- [DocStringAttribute("DocWithCtorTest StaticTestMethod")]`
	`23`	`+ [DocString("DocWithCtorTest StaticTestMethod")]`
`24`	`24`	`public static void StaticTestMethod()`
`25`	`25`	`{`
`26`	`26`	`}`
`@@ -41,17 +41,17 @@ public static void StaticTestMethod(double a, int b)`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`- [DocStringAttribute("DocWithoutCtorTest Class")]`
	`44`	`+ [DocString("DocWithoutCtorTest Class")]`
`45`	`45`	`public class DocWithoutCtorTest`
`46`	`46`	`{`
`47`		`- [DocStringAttribute("DocWithoutCtorTest TestMethod")]`
	`47`	`+ [DocString("DocWithoutCtorTest TestMethod")]`
`48`	`48`	`public void TestMethod()`
`49`	`49`	`{`
`50`	`50`	`}`
`51`	`51`
`52`		`- [DocStringAttribute("DocWithoutCtorTest StaticTestMethod")]`
	`52`	`+ [DocString("DocWithoutCtorTest StaticTestMethod")]`
`53`	`53`	`public static void StaticTestMethod()`
`54`	`54`	`{`
`55`	`55`	`}`
`56`	`56`	`}`
`57`		`-}`
	`57`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public enum ULongEnum : ulong`
`86`	`86`	`Five`
`87`	`87`	`}`
`88`	`88`
`89`		`- [FlagsAttribute]`
	`89`	`+ [Flags]`
`90`	`90`	`public enum FlagsEnum`
`91`	`91`	`{`
`92`	`92`	`Zero,`
`@@ -96,4 +96,4 @@ public enum FlagsEnum`
`96`	`96`	`Four,`
`97`	`97`	`Five`
`98`	`98`	`}`
`99`		`-}`
	`99`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -99,4 +99,4 @@ public string GetExtraInfo()`
`99`	`99`	`return extra;`
`100`	`100`	`}`
`101`	`101`	`}`
`102`		`-}`
	`102`	`+}`