Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Make negative caches writable only for non-subscripted generics
  • Loading branch information
ilevkivskyi committed Feb 4, 2017
commit 0ca5c0b0c6ba2047a65ccff733bde5cbe82bcd2b
18 changes: 10 additions & 8 deletions python2/typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -1082,10 +1082,11 @@ def _abc_negative_cache(self):

@_abc_negative_cache.setter
def _abc_negative_cache(self, value):
if isinstance(self.__extra__, abc.ABCMeta):
self.__extra__._abc_negative_cache = value
else:
_gorg(self)._abc_generic_negative_cache = value
if self.__origin__ is None:
if isinstance(self.__extra__, abc.ABCMeta):
self.__extra__._abc_negative_cache = value
else:
self._abc_generic_negative_cache = value

@property
def _abc_negative_cache_version(self):
Expand All @@ -1095,10 +1096,11 @@ def _abc_negative_cache_version(self):

@_abc_negative_cache_version.setter
def _abc_negative_cache_version(self, value):
if isinstance(self.__extra__, abc.ABCMeta):
self.__extra__._abc_negative_cache_version = value
else:
_gorg(self)._abc_generic_negative_cache_version = value
if self.__origin__ is None:
if isinstance(self.__extra__, abc.ABCMeta):
self.__extra__._abc_negative_cache_version = value
else:
self._abc_generic_negative_cache_version = value

def _get_type_vars(self, tvars):
if self.__origin__ and self.__parameters__:
Expand Down
18 changes: 10 additions & 8 deletions src/typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -1009,10 +1009,11 @@ def _abc_negative_cache(self):

@_abc_negative_cache.setter
def _abc_negative_cache(self, value):
if isinstance(self.__extra__, abc.ABCMeta):
self.__extra__._abc_negative_cache = value
else:
_gorg(self)._abc_generic_negative_cache = value
if self.__origin__ is None:
if isinstance(self.__extra__, abc.ABCMeta):
self.__extra__._abc_negative_cache = value
else:
self._abc_generic_negative_cache = value

@property
def _abc_negative_cache_version(self):
Expand All @@ -1022,10 +1023,11 @@ def _abc_negative_cache_version(self):

@_abc_negative_cache_version.setter
def _abc_negative_cache_version(self, value):
if isinstance(self.__extra__, abc.ABCMeta):
self.__extra__._abc_negative_cache_version = value
else:
_gorg(self)._abc_generic_negative_cache_version = value
if self.__origin__ is None:
if isinstance(self.__extra__, abc.ABCMeta):
self.__extra__._abc_negative_cache_version = value
else:
self._abc_generic_negative_cache_version = value

def _get_type_vars(self, tvars):
if self.__origin__ and self.__parameters__:
Expand Down