Switch to unified view

a/Ming/ming/schema.py b/Ming/ming/schema.py
...
...
86
        '''Migration function to go from object { key: value } to
86
        '''Migration function to go from object { key: value } to
87
        list [ { key_name: key, value_name: value} ].  If value_name is None,
87
        list [ { key_name: key, value_name: value} ].  If value_name is None,
88
        then value must be an object and the result will be a list
88
        then value must be an object and the result will be a list
89
        [ { key_name: key, **value } ].
89
        [ { key_name: key, **value } ].
90
        '''
90
        '''
91
        from sf.gutenberg.model import base
91
        from . import base
92
        def migrate_scalars(value):
92
        def migrate_scalars(value):
93
            return [
93
            return [
94
                base.Object({ key_name: k, value_name: v})
94
                base.Object({ key_name: k, value_name: v})
95
                for k,v in value.iteritems() ]
95
                for k,v in value.iteritems() ]
96
        def migrate_objects(value):
96
        def migrate_objects(value):
...
...
171
                    self.managed_class,
171
                    self.managed_class,
172
                    inv.msg.replace('\n', '\n    '))
172
                    inv.msg.replace('\n', '\n    '))
173
            raise
173
            raise
174
174
175
    def _validate(self, d, allow_extra=False, strip_extra=False):
175
    def _validate(self, d, allow_extra=False, strip_extra=False):
176
        from sf.gutenberg.model import base
176
        from . import base
177
        cls = self.managed_class
177
        cls = self.managed_class
178
        if self.polymorphic_registry:
178
        if self.polymorphic_registry:
179
            disc = d.get(self.polymorphic_on, Missing)
179
            disc = d.get(self.polymorphic_on, Missing)
180
            if disc is Missing:
180
            if disc is Missing:
181
                disc = d[self.polymorphic_on] = self.managed_class.__name__
181
                disc = d[self.polymorphic_on] = self.managed_class.__name__