Merge pull request #291 from jleclanche/fix/djstripe-524

Fix accessor replacement consistency on Django 1.11
fix_request_path_info
Diederik van der Boor 2017-06-20 12:06:22 +02:00 committed by GitHub
commit 00d4610539
1 changed files with 2 additions and 2 deletions

View File

@ -173,9 +173,9 @@ class PolymorphicModel(six.with_metaclass(PolymorphicModelBase, models.Model)):
ReverseSingleRelatedObjectDescriptor as ForwardManyToOneDescriptor, ReverseSingleRelatedObjectDescriptor as ForwardManyToOneDescriptor,
) )
for name, model in subclasses_and_superclasses_accessors.items(): for name, model in subclasses_and_superclasses_accessors.items():
# Here be dragons.
orig_accessor = getattr(self.__class__, name, None) orig_accessor = getattr(self.__class__, name, None)
if type(orig_accessor) in [ReverseOneToOneDescriptor, ForwardManyToOneDescriptor]: if issubclass(type(orig_accessor), (ReverseOneToOneDescriptor, ForwardManyToOneDescriptor)):
# print >>sys.stderr, '---------- replacing', name, orig_accessor, '->', model
setattr(self.__class__, name, property(create_accessor_function_for_model(model, name))) setattr(self.__class__, name, property(create_accessor_function_for_model(model, name)))
def _get_inheritance_relation_fields_and_models(self): def _get_inheritance_relation_fields_and_models(self):