equal
deleted
inserted
replaced
788 DeprecationWarning) |
788 DeprecationWarning) |
789 for rtype, role in self.cw_skip_copy_for: |
789 for rtype, role in self.cw_skip_copy_for: |
790 assert role in ('subject', 'object'), role |
790 assert role in ('subject', 'object'), role |
791 skip_copy_for[role].add(rtype) |
791 skip_copy_for[role].add(rtype) |
792 for rschema in self.e_schema.subject_relations(): |
792 for rschema in self.e_schema.subject_relations(): |
|
793 if rschema.type in skip_copy_for['subject']: |
|
794 continue |
793 if rschema.final or rschema.meta: |
795 if rschema.final or rschema.meta: |
794 continue |
796 continue |
795 # skip already defined relations |
797 # skip already defined relations |
796 if getattr(self, rschema.type): |
798 if getattr(self, rschema.type): |
797 continue |
|
798 if rschema.type in skip_copy_for['subject']: |
|
799 continue |
799 continue |
800 # skip composite relation |
800 # skip composite relation |
801 rdef = self.e_schema.rdef(rschema) |
801 rdef = self.e_schema.rdef(rschema) |
802 if rdef.composite: |
802 if rdef.composite: |
803 continue |
803 continue |