Skip to content

Commit c53963f

Browse files
ilevkivskyiilevkivskyi
authored
Fix name and imports for test module mod_generics_cache.py (#390)
* Fix name and imports for test module mod_generics_cache * Fix lint
1 parent 370a137 commit c53963f

File tree

4 files changed

+43
-31
lines changed

4 files changed

+43
-31
lines changed

‎python2/mod.py‎ renamed to ‎python2/mod_generics_cache.py‎

File renamed without changes.

‎python2/test_typing.py‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,7 @@ def test_subscript_meta(self):
739739
self.assertEqual(Callable[..., GenericMeta].__args__, (Ellipsis, GenericMeta))
740740

741741
def test_generic_hashes(self):
742-
import mod
742+
import mod_generics_cache
743743
class A(Generic[T]):
744744
__module__ = 'test_typing'
745745

@@ -748,31 +748,35 @@ class A(Generic[T]):
748748
pass
749749

750750
self.assertEqual(A, A)
751-
self.assertEqual(mod.A[str], mod.A[str])
751+
self.assertEqual(mod_generics_cache.A[str], mod_generics_cache.A[str])
752752
self.assertEqual(B.A, B.A)
753-
self.assertEqual(mod.B.A[B.A[str]], mod.B.A[B.A[str]])
753+
self.assertEqual(mod_generics_cache.B.A[B.A[str]],
754+
mod_generics_cache.B.A[B.A[str]])
754755

755756
self.assertNotEqual(A, B.A)
756-
self.assertNotEqual(A, mod.A)
757-
self.assertNotEqual(A, mod.B.A)
758-
self.assertNotEqual(B.A, mod.A)
759-
self.assertNotEqual(B.A, mod.B.A)
757+
self.assertNotEqual(A, mod_generics_cache.A)
758+
self.assertNotEqual(A, mod_generics_cache.B.A)
759+
self.assertNotEqual(B.A, mod_generics_cache.A)
760+
self.assertNotEqual(B.A, mod_generics_cache.B.A)
760761

761762
self.assertNotEqual(A[str], B.A[str])
762763
self.assertNotEqual(A[List[Any]], B.A[List[Any]])
763-
self.assertNotEqual(A[str], mod.A[str])
764-
self.assertNotEqual(A[str], mod.B.A[str])
765-
self.assertNotEqual(B.A[int], mod.A[int])
766-
self.assertNotEqual(B.A[List[Any]], mod.B.A[List[Any]])
764+
self.assertNotEqual(A[str], mod_generics_cache.A[str])
765+
self.assertNotEqual(A[str], mod_generics_cache.B.A[str])
766+
self.assertNotEqual(B.A[int], mod_generics_cache.A[int])
767+
self.assertNotEqual(B.A[List[Any]], mod_generics_cache.B.A[List[Any]])
767768

768769
self.assertNotEqual(Tuple[A[str]], Tuple[B.A[str]])
769770
self.assertNotEqual(Tuple[A[List[Any]]], Tuple[B.A[List[Any]]])
770-
self.assertNotEqual(Union[str, A[str]], Union[str, mod.A[str]])
771-
self.assertNotEqual(Union[A[str], A[str]], Union[A[str], mod.A[str]])
772-
self.assertNotEqual(typing.FrozenSet[A[str]], typing.FrozenSet[mod.B.A[str]])
771+
self.assertNotEqual(Union[str, A[str]], Union[str, mod_generics_cache.A[str]])
772+
self.assertNotEqual(Union[A[str], A[str]],
773+
Union[A[str], mod_generics_cache.A[str]])
774+
self.assertNotEqual(typing.FrozenSet[A[str]],
775+
typing.FrozenSet[mod_generics_cache.B.A[str]])
773776

774777
self.assertTrue(repr(Tuple[A[str]]).endswith('test_typing.A[str]]'))
775-
self.assertTrue(repr(Tuple[mod.A[str]]).endswith('mod.A[str]]'))
778+
self.assertTrue(repr(Tuple[mod_generics_cache.A[str]])
779+
.endswith('mod_generics_cache.A[str]]'))
776780

777781
def test_extended_generic_rules_eq(self):
778782
T = TypeVar('T')

‎src/mod.py‎ renamed to ‎src/mod_generics_cache.py‎

File renamed without changes.

‎src/test_typing.py‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,10 @@ def test_subscript_meta(self):
771771
self.assertEqual(Callable[..., GenericMeta].__args__, (Ellipsis, GenericMeta))
772772

773773
def test_generic_hashes(self):
774-
import mod
774+
try:
775+
from test import mod_generics_cache
776+
except ImportError: # for Python 3.4 and previous versions
777+
import mod_generics_cache
775778
class A(Generic[T]):
776779
...
777780

@@ -780,34 +783,39 @@ class A(Generic[T]):
780783
...
781784

782785
self.assertEqual(A, A)
783-
self.assertEqual(mod.A[str], mod.A[str])
786+
self.assertEqual(mod_generics_cache.A[str], mod_generics_cache.A[str])
784787
self.assertEqual(B.A, B.A)
785-
self.assertEqual(mod.B.A[B.A[str]], mod.B.A[B.A[str]])
788+
self.assertEqual(mod_generics_cache.B.A[B.A[str]],
789+
mod_generics_cache.B.A[B.A[str]])
786790

787791
self.assertNotEqual(A, B.A)
788-
self.assertNotEqual(A, mod.A)
789-
self.assertNotEqual(A, mod.B.A)
790-
self.assertNotEqual(B.A, mod.A)
791-
self.assertNotEqual(B.A, mod.B.A)
792+
self.assertNotEqual(A, mod_generics_cache.A)
793+
self.assertNotEqual(A, mod_generics_cache.B.A)
794+
self.assertNotEqual(B.A, mod_generics_cache.A)
795+
self.assertNotEqual(B.A, mod_generics_cache.B.A)
792796

793797
self.assertNotEqual(A[str], B.A[str])
794798
self.assertNotEqual(A[List[Any]], B.A[List[Any]])
795-
self.assertNotEqual(A[str], mod.A[str])
796-
self.assertNotEqual(A[str], mod.B.A[str])
797-
self.assertNotEqual(B.A[int], mod.A[int])
798-
self.assertNotEqual(B.A[List[Any]], mod.B.A[List[Any]])
799+
self.assertNotEqual(A[str], mod_generics_cache.A[str])
800+
self.assertNotEqual(A[str], mod_generics_cache.B.A[str])
801+
self.assertNotEqual(B.A[int], mod_generics_cache.A[int])
802+
self.assertNotEqual(B.A[List[Any]], mod_generics_cache.B.A[List[Any]])
799803

800804
self.assertNotEqual(Tuple[A[str]], Tuple[B.A[str]])
801805
self.assertNotEqual(Tuple[A[List[Any]]], Tuple[B.A[List[Any]]])
802-
self.assertNotEqual(Union[str, A[str]], Union[str, mod.A[str]])
803-
self.assertNotEqual(Union[A[str], A[str]], Union[A[str], mod.A[str]])
804-
self.assertNotEqual(typing.FrozenSet[A[str]], typing.FrozenSet[mod.B.A[str]])
806+
self.assertNotEqual(Union[str, A[str]], Union[str, mod_generics_cache.A[str]])
807+
self.assertNotEqual(Union[A[str], A[str]],
808+
Union[A[str], mod_generics_cache.A[str]])
809+
self.assertNotEqual(typing.FrozenSet[A[str]],
810+
typing.FrozenSet[mod_generics_cache.B.A[str]])
805811

806812
if sys.version_info[:2] > (3, 2):
807813
self.assertTrue(repr(Tuple[A[str]]).endswith('<locals>.A[str]]'))
808814
self.assertTrue(repr(Tuple[B.A[str]]).endswith('<locals>.B.A[str]]'))
809-
self.assertTrue(repr(Tuple[mod.A[str]]).endswith('mod.A[str]]'))
810-
self.assertTrue(repr(Tuple[mod.B.A[str]]).endswith('mod.B.A[str]]'))
815+
self.assertTrue(repr(Tuple[mod_generics_cache.A[str]])
816+
.endswith('mod_generics_cache.A[str]]'))
817+
self.assertTrue(repr(Tuple[mod_generics_cache.B.A[str]])
818+
.endswith('mod_generics_cache.B.A[str]]'))
811819

812820
def test_extended_generic_rules_eq(self):
813821
T = TypeVar('T')

0 commit comments

Comments
 (0)