Skip to content

Commit b7bfd2d

Browse files
vmuriartvmuriart
committed
Clean-up imports
- Fix py2/py3 range/zip behavior - Ensure same functions being used - Fix Exception/System.Exception name clashes
1 parent a51a4bf commit b7bfd2d

23 files changed

+151
-118
lines changed

‎src/tests/test_array.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# -*- coding: utf-8 -*-
22

33
import unittest
4+
45
import Python.Test as Test
56
import System
6-
from _compat import UserList, PY2, long, unichr
7+
8+
from _compat import PY2, UserList, long, range, unichr
79

810

911
class ArrayTests(unittest.TestCase):

‎src/tests/test_class.py‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44

55
import Python.Test as Test
66
import System
7-
from Python.Test import ClassTest
8-
from System.Collections import Hashtable
97

10-
from _compat import DictProxyType
8+
from _compat import DictProxyType, range
119

1210

1311
class ClassTests(unittest.TestCase):
@@ -25,13 +23,17 @@ def testBasicValueType(self):
2523

2624
def testClassStandardAttrs(self):
2725
"""Test standard class attributes."""
26+
from Python.Test import ClassTest
27+
2828
self.assertTrue(ClassTest.__name__ == 'ClassTest')
2929
self.assertTrue(ClassTest.__module__ == 'Python.Test')
3030
self.assertTrue(type(ClassTest.__dict__) == DictProxyType)
3131
self.assertTrue(len(ClassTest.__doc__) > 0)
3232

3333
def testClassDocstrings(self):
3434
"""Test standard class docstring generation"""
35+
from Python.Test import ClassTest
36+
3537
value = 'Void .ctor()'
3638
self.assertTrue(ClassTest.__doc__ == value)
3739

@@ -47,7 +49,6 @@ def testClassDefaultRepr(self):
4749

4850
def testNonPublicClass(self):
4951
"""Test that non-public classes are inaccessible."""
50-
from Python import Test
5152

5253
def test():
5354
from Python.Test import InternalClass
@@ -61,6 +62,7 @@ def test():
6162

6263
def testBasicSubclass(self):
6364
"""Test basic subclass of a managed class."""
65+
from System.Collections import Hashtable
6466

6567
class MyTable(Hashtable):
6668
def howMany(self):
@@ -141,26 +143,31 @@ def testStructConstruction(self):
141143

142144
def testIEnumerableIteration(self):
143145
"""Test iteration over objects supporting IEnumerable."""
144-
list = Test.ClassTest.GetArrayList()
146+
from Python.Test import ClassTest
147+
148+
list = ClassTest.GetArrayList()
145149

146150
for item in list:
147151
self.assertTrue((item > -1) and (item < 10))
148152

149-
dict = Test.ClassTest.GetHashtable()
153+
dict = ClassTest.GetHashtable()
150154

151155
for item in dict:
152156
cname = item.__class__.__name__
153157
self.assertTrue(cname.endswith('DictionaryEntry'))
154158

155159
def testIEnumeratorIteration(self):
156160
"""Test iteration over objects supporting IEnumerator."""
157-
chars = Test.ClassTest.GetEnumerator()
161+
from Python.Test import ClassTest
162+
163+
chars = ClassTest.GetEnumerator()
158164

159165
for item in chars:
160166
self.assertTrue(item in 'test string')
161167

162168
def testOverrideGetItem(self):
163169
"""Test managed subclass overriding __getitem__."""
170+
from System.Collections import Hashtable
164171

165172
class MyTable(Hashtable):
166173
def __getitem__(self, key):
@@ -180,6 +187,7 @@ def __getitem__(self, key):
180187

181188
def testOverrideSetItem(self):
182189
"""Test managed subclass overriding __setitem__."""
190+
from System.Collections import Hashtable
183191

184192
class MyTable(Hashtable):
185193
def __setitem__(self, key, value):
@@ -198,10 +206,9 @@ def __setitem__(self, key, value):
198206
self.assertTrue(table.Count == 3)
199207

200208
def testAddAndRemoveClassAttribute(self):
201-
202209
from System import TimeSpan
203210

204-
for i in range(100):
211+
for _ in range(100):
205212
TimeSpan.new_method = lambda self: self.TotalMinutes
206213
ts = TimeSpan.FromHours(1)
207214
self.assertTrue(ts.new_method() == 60)
@@ -210,6 +217,7 @@ def testAddAndRemoveClassAttribute(self):
210217

211218
def testComparisons(self):
212219
from System import DateTimeOffset
220+
from Python.Test import ClassTest
213221

214222
d1 = DateTimeOffset.Parse("2016-11-14")
215223
d2 = DateTimeOffset.Parse("2016-11-15")
@@ -247,12 +255,14 @@ def testComparisons(self):
247255
self.assertRaises(TypeError, lambda: c1 < c2)
248256

249257
def testSelfCallback(self):
250-
""" Test calling back and forth between this and a c# baseclass."""
258+
"""Test calling back and forth between this and a c# baseclass."""
259+
251260
class CallbackUser(Test.SelfCallbackTest):
252261
def DoCallback(self):
253262
self.PyCallbackWasCalled = False
254263
self.SameReference = False
255264
return self.Callback(self)
265+
256266
def PyCallback(self, self2):
257267
self.PyCallbackWasCalled = True
258268
self.SameReference = self == self2
@@ -262,6 +272,7 @@ def PyCallback(self, self2):
262272
self.assertTrue(testobj.PyCallbackWasCalled)
263273
self.assertTrue(testobj.SameReference)
264274

275+
265276
class ClassicClass:
266277
def kind(self):
267278
return 'classic'

‎src/tests/test_compat.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# -*- coding: utf-8 -*-
22

3-
import unittest
43
import types
5-
from _compat import PY2, PY3, ClassType
4+
import unittest
5+
6+
from _compat import ClassType, PY2, PY3, range
67

78

89
class CompatibilityTests(unittest.TestCase):

‎src/tests/test_constructors.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# -*- coding: utf-8 -*-
22

33
import unittest
4+
45
import System
56

67

‎src/tests/test_conversion.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# -*- coding: utf-8 -*-
22

33
import unittest
4-
from Python.Test import ConversionTest
4+
55
import System
6-
from _compat import indexbytes, long, unichr
6+
from Python.Test import ConversionTest
7+
8+
from _compat import indexbytes, long, range, unichr
79

810

911
class ConversionTests(unittest.TestCase):

‎src/tests/test_delegate.py‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
# -*- coding: utf-8 -*-
2+
# TODO: Add test for ObjectDelegate
23

3-
from Python.Test import DelegateTest, PublicDelegate
4-
from Python.Test import StringDelegate, ObjectDelegate
5-
from Python.Test import BoolDelegate
64
import unittest
5+
76
import Python.Test as Test
87
import System
8+
from Python.Test import DelegateTest, StringDelegate
9+
910
from _compat import DictProxyType
1011

1112

@@ -14,6 +15,8 @@ class DelegateTests(unittest.TestCase):
1415

1516
def testDelegateStandardAttrs(self):
1617
"""Test standard delegate attributes."""
18+
from Python.Test import PublicDelegate
19+
1720
self.assertTrue(PublicDelegate.__name__ == 'PublicDelegate')
1821
self.assertTrue(PublicDelegate.__module__ == 'Python.Test')
1922
self.assertTrue(type(PublicDelegate.__dict__) == DictProxyType)
@@ -264,6 +267,7 @@ def count(self):
264267

265268
def testSubclassDelegateFails(self):
266269
"""Test that subclassing of a delegate type fails."""
270+
from Python.Test import PublicDelegate
267271

268272
def test():
269273
class Boom(PublicDelegate):
@@ -284,6 +288,7 @@ def sayhello():
284288

285289
def testBoolDelegate(self):
286290
"""Test boolean delegate."""
291+
from Python.Test import BoolDelegate
287292

288293
def always_so_negative():
289294
return 0

‎src/tests/test_docstring.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,27 @@
22

33
import unittest
44

5-
from Python.Test import DocWithCtorTest, DocWithoutCtorTest, DocWithCtorNoDocTest
6-
75

86
class DocStringTests(unittest.TestCase):
97
"""Test doc strings support."""
108

119
def testDocWithCtor(self):
10+
from Python.Test import DocWithCtorTest
11+
1212
self.assertEqual(DocWithCtorTest.__doc__, 'DocWithCtorTest Class')
1313
self.assertEqual(DocWithCtorTest.TestMethod.__doc__, 'DocWithCtorTest TestMethod')
1414
self.assertEqual(DocWithCtorTest.StaticTestMethod.__doc__, 'DocWithCtorTest StaticTestMethod')
1515

1616
def testDocWithCtorNoDoc(self):
17+
from Python.Test import DocWithCtorNoDocTest
18+
1719
self.assertEqual(DocWithCtorNoDocTest.__doc__, 'Void .ctor(Boolean)')
1820
self.assertEqual(DocWithCtorNoDocTest.TestMethod.__doc__, 'Void TestMethod(Double, Int32)')
1921
self.assertEqual(DocWithCtorNoDocTest.StaticTestMethod.__doc__, 'Void StaticTestMethod(Double, Int32)')
2022

2123
def testDocWithoutCtor(self):
24+
from Python.Test import DocWithoutCtorTest
25+
2226
self.assertEqual(DocWithoutCtorTest.__doc__, 'DocWithoutCtorTest Class')
2327
self.assertEqual(DocWithoutCtorTest.TestMethod.__doc__, 'DocWithoutCtorTest TestMethod')
2428
self.assertEqual(DocWithoutCtorTest.StaticTestMethod.__doc__, 'DocWithoutCtorTest StaticTestMethod')

‎src/tests/test_engine.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
# -*- coding: utf-8 -*-
2+
# FIXME: This test module fails due to unhandled exceptions
23

34
import sys
45
import unittest
5-
from Python.Runtime import PythonEngine
66

7+
import System
8+
from Python.Runtime import PythonEngine
79

8-
# XXX This test module isn't used!
910

1011
class EngineTests(unittest.TestCase):
1112
"""Test PythonEngine embedding APIs."""

‎src/tests/test_enum.py‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# -*- coding: utf-8 -*-
22

33
import unittest
4-
from System import DayOfWeek
5-
from Python import Test
4+
5+
import Python.Test as Test
6+
67
from _compat import DictProxyType, long
78

89

@@ -11,13 +12,17 @@ class EnumTests(unittest.TestCase):
1112

1213
def testEnumStandardAttrs(self):
1314
"""Test standard enum attributes."""
15+
from System import DayOfWeek
16+
1417
self.assertTrue(DayOfWeek.__name__ == 'DayOfWeek')
1518
self.assertTrue(DayOfWeek.__module__ == 'System')
1619
self.assertTrue(type(DayOfWeek.__dict__) == DictProxyType)
1720
self.assertTrue(DayOfWeek.__doc__ == None)
1821

1922
def testEnumGetMember(self):
2023
"""Test access to enum members."""
24+
from System import DayOfWeek
25+
2126
self.assertTrue(DayOfWeek.Sunday == 0)
2227
self.assertTrue(DayOfWeek.Monday == 1)
2328
self.assertTrue(DayOfWeek.Tuesday == 2)
@@ -76,6 +81,7 @@ def testULongEnum(self):
7681

7782
def testInstantiateEnumFails(self):
7883
"""Test that instantiation of an enum class fails."""
84+
from System import DayOfWeek
7985

8086
def test():
8187
ob = DayOfWeek()
@@ -84,6 +90,7 @@ def test():
8490

8591
def testSubclassEnumFails(self):
8692
"""Test that subclassing of an enumeration fails."""
93+
from System import DayOfWeek
8794

8895
def test():
8996
class Boom(DayOfWeek):
@@ -93,6 +100,7 @@ class Boom(DayOfWeek):
93100

94101
def testEnumSetMemberFails(self):
95102
"""Test that setattr operations on enumerations fail."""
103+
from System import DayOfWeek
96104

97105
def test():
98106
DayOfWeek.Sunday = 13

‎src/tests/test_event.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# -*- coding: utf-8 -*-
22

33
import unittest
4-
from Python.Test import EventTest, TestEventHandler
5-
from Python.Test import TestEventArgs
4+
5+
from Python.Test import EventTest, TestEventArgs
6+
7+
from _compat import range
68

79

810
class EventTests(unittest.TestCase):
@@ -515,7 +517,7 @@ def test():
515517
object.PublicEvent -= handler.handler
516518

517519
def testIncorrectInvokation(self):
518-
"""Test incorrect invokation of events."""
520+
"""Test incorrect invocation of events."""
519521
object = EventTest()
520522

521523
handler = GenericHandler()
@@ -535,6 +537,8 @@ def test():
535537

536538
def testExplicitCLSEventRegistration(self):
537539
"""Test explicit CLS event registration."""
540+
from Python.Test import TestEventHandler
541+
538542
object = EventTest()
539543
handler = GenericHandler()
540544

0 commit comments

Comments
 (0)