Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[entity] Stop returning source information in cw_metainformation()
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Fri, 30 Sep 2016 17:34:11 +0200
changeset 11762 7518cb58ab4c
parent 11761 78c8a2bb04ff
child 11763 39df042f4ab4
[entity] Stop returning source information in cw_metainformation() We should not need that. It has been introduced to handle things we should not do and probably don't do anymore (e.g. attempting to grasp recursive import of several sites). Related to #15538288.
cubicweb/entity.py file | annotate | diff | comparison | revisions
cubicweb/server/test/unittest_datafeed.py file | annotate | diff | comparison | revisions
cubicweb/server/test/unittest_ldapsource.py file | annotate | diff | comparison | revisions
cubicweb/test/unittest_entity.py file | annotate | diff | comparison | revisions
cubicweb/web/views/xmlrss.py file | annotate | diff | comparison | revisions 
--- a/cubicweb/entity.py	Fri Sep 30 17:04:42 2016 +0200
+++ b/cubicweb/entity.py	Fri Sep 30 17:34:11 2016 +0200
@@ -625,9 +625,7 @@
 
     @cached
     def cw_metainformation(self):
-        metas = self._cw.entity_metas(self.eid)
-        metas['source'] = self._cw.source_defs()[metas['source']]
-        return metas
+        return self._cw.entity_metas(self.eid)
 
     def cw_check_perm(self, action):
         self.e_schema.check_perm(self._cw, action, eid=self.eid)
--- a/cubicweb/server/test/unittest_datafeed.py	Fri Sep 30 17:04:42 2016 +0200
+++ b/cubicweb/server/test/unittest_datafeed.py	Fri Sep 30 17:34:11 2016 +0200
@@ -86,7 +86,6 @@
                 self.assertEqual(entity.cw_source[0].name, u'ô myfeed')
                 self.assertEqual(entity.cw_metainformation(),
                                  {'type': 'Card',
-                                  'source': {'uri': u'ô myfeed', 'type': 'datafeed', 'use-cwuri-as-url': True},
                                   'extid': b'http://www.cubicweb.org/'}
                                  )
                 # test repo cache keys
@@ -107,7 +106,6 @@
             self.assertEqual(entity.cw_source[0].name, 'myrenamedfeed')
             self.assertEqual(entity.cw_metainformation(),
                              {'type': 'Card',
-                              'source': {'uri': 'myrenamedfeed', 'type': 'datafeed', 'use-cwuri-as-url': True},
                               'extid': b'http://www.cubicweb.org/'}
                              )
             self.assertEqual(self.repo._type_source_cache[entity.eid],
--- a/cubicweb/server/test/unittest_ldapsource.py	Fri Sep 30 17:04:42 2016 +0200
+++ b/cubicweb/server/test/unittest_ldapsource.py	Fri Sep 30 17:34:11 2016 +0200
@@ -284,10 +284,7 @@
             self.assertEqual(len(rset), 1)
             e = rset.get_entity(0, 0)
             self.assertEqual(e.eid, eid)
-            self.assertEqual(e.cw_metainformation(), {'source': {'type': u'native',
-                                                                 'uri': u'system',
-                                                                 'use-cwuri-as-url': False},
-                                                      'type': 'CWUser',
+            self.assertEqual(e.cw_metainformation(), {'type': 'CWUser',
                                                       'extid': None})
             self.assertEqual(e.cw_source[0].name, 'system')
             self.assertTrue(e.creation_date)
@@ -297,10 +294,7 @@
             self.assertEqual(len(rset), 1)
             self.assertTrue(self.repo.system_source.authenticate(cnx, 'syt', password='syt'))
             # make sure the pull from ldap have not "reverted" user as a ldap-feed user
-            self.assertEqual(e.cw_metainformation(), {'source': {'type': u'native',
-                                                                 'uri': u'system',
-                                                                 'use-cwuri-as-url': False},
-                                                      'type': 'CWUser',
+            self.assertEqual(e.cw_metainformation(), {'type': 'CWUser',
                                                       'extid': None})
             # and that the password stored in the system source is not empty or so
             user = cnx.execute('CWUser U WHERE U login "syt"').get_entity(0, 0)
--- a/cubicweb/test/unittest_entity.py	Fri Sep 30 17:04:42 2016 +0200
+++ b/cubicweb/test/unittest_entity.py	Fri Sep 30 17:34:11 2016 +0200
@@ -835,9 +835,7 @@
         with self.admin_access.web_request() as req:
             note = req.create_entity('Note', type=u'z')
             metainf = note.cw_metainformation()
-            self.assertEqual(metainf, {'source': {'type': 'native', 'uri': 'system',
-                                                  'use-cwuri-as-url': False},
-                                       'type': u'Note', 'extid': None})
+            self.assertEqual(metainf, {'type': u'Note', 'extid': None})
 
     def test_absolute_url_empty_field(self):
         with self.admin_access.web_request() as req:
--- a/cubicweb/web/views/xmlrss.py	Fri Sep 30 17:04:42 2016 +0200
+++ b/cubicweb/web/views/xmlrss.py	Fri Sep 30 17:34:11 2016 +0200
@@ -77,7 +77,7 @@
     def entity_call(self, entity):
         """element as an item for an xml feed"""
         entity.complete()
-        source = entity.cw_metainformation()['source']['uri']
+        source = entity.cw_source[0].name
         self.w(u'<%s eid="%s" cwuri="%s" cwsource="%s">\n'
                % (entity.cw_etype, entity.eid, xml_escape(entity.cwuri),
                   xml_escape(source)))
cubicweb