Remove unused using from testing and format

pythonnet · vmuriart · Jan 22, 2017 · Jan 22, 2017 · Jan 22, 2017 · Jan 22, 2017
commit 2ae78cca2a75bbb180441fffde8fde05a9251560
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 change
@@ Expand Up / @@ -86,7 +86,7 @@ public enum ULongEnum : ulong @@
             Five
         }
-        [FlagsAttribute]
+        [Flags]
         public enum FlagsEnum
         {
             Zero,
@@ Expand All / @@ -96,4 +96,4 @@ public enum FlagsEnum @@
             Four,
             Five
         }
-    }
+    }