cubicweb: comparison server/repository.py

equal deleted inserted replaced

-:6cbc7bc8ea6d
+:5fe84a5f7035
 elif config.bootstrap_schema:
 # usually during repository creation
 self.warning("set fs application'schema as bootstrap schema")
 config.bootstrap_cubes()
 self.set_bootstrap_schema(self.config.load_schema())
-# need to load the Any and EUser entity types
+# need to load the Any and CWUser entity types
 self.vreg.schema = self.schema
 etdirectory = join(CW_SOFTWARE_ROOT, 'entities')
 self.vreg.init_registration([etdirectory])
 self.vreg.load_file(join(etdirectory, '__init__.py'),
 'cubicweb.entities.__init__')
 # test start: use the file system schema (quicker)
 self.warning("set fs application'schema")
 config.bootstrap_cubes()
 self.set_schema(self.config.load_schema())
 if not config.creating:
-if 'EProperty' in self.schema:
+if 'CWProperty' in self.schema:
 self.vreg.init_properties(self.properties())
 # call source's init method to complete their initialisation if
 # needed (for instance looking for persistent configuration using an
 # internal session, which is not possible until pools have been
 # initialized)
 try:
 deserialize_schema(appschema, session)
 except BadSchemaDefinition:
 raise
 except Exception, ex:
+import traceback
+traceback.print_exc()
 raise Exception('Is the database initialised ? (cause: %s)' %
 (ex.args and ex.args[0].strip() or 'unknown')), \
 None, sys.exc_info()[-1]
 self.info('set the actual schema')
-# XXX have to do this since EProperty isn't in the bootstrap schema
+# XXX have to do this since CWProperty isn't in the bootstrap schema
 #     it'll be redone in set_schema
 self.set_bootstrap_schema(appschema)
 # 2.49 migration
 if exists(join(self.config.apphome, 'vc.conf')):
 session.set_pool()
 if not 'template' in file(join(self.config.apphome, 'vc.conf')).read():
 # remaning from cubicweb < 2.38...
-session.execute('DELETE EProperty X WHERE X pkey "system.version.template"')
+session.execute('DELETE CWProperty X WHERE X pkey "system.version.template"')
 session.commit()
 finally:
 session.close()
 self.config.init_cubes(self.get_cubes())
 self.set_schema(appschema)
 except ZeroDivisionError:
 pass
 def authenticate_user(self, session, login, password):
 """validate login / password, raise AuthenticationError on failure
-return associated EUser instance on success
+return associated CWUser instance on success
 """
 for source in self.sources:
-if source.support_entity('EUser'):
+if source.support_entity('CWUser'):
 try:
 eid = source.authenticate(session, login, password)
 break
 except AuthenticationError:
 continue
 not euser.state in euser.AUTHENTICABLE_STATES:
 raise AuthenticationError('user is not in authenticable state')
 return euser
 def _build_user(self, session, eid):
-"""return a EUser entity for user with the given eid"""
+"""return a CWUser entity for user with the given eid"""
-cls = self.vreg.etype_class('EUser')
+cls = self.vreg.etype_class('CWUser')
 rql = cls.fetch_rql(session.user, ['X eid %(x)s'])
 rset = session.execute(rql, {'x': eid}, 'x')
 assert len(rset) == 1, rset
 euser = rset.get_entity(0, 0)
 # pylint: disable-msg=W0104
 from logilab.common.changelog import Version
 vcconf = {}
 session = self.internal_session()
 try:
 for pk, version in session.execute(
-'Any K,V WHERE P is EProperty, P value V, P pkey K, '
+'Any K,V WHERE P is CWProperty, P value V, P pkey K, '
 'P pkey ~="system.version.%"', build_descr=False):
 cube = pk.split('.')[-1]
 # XXX cubicweb migration
 if cube in CW_MIGRATION_MAP:
 cube = CW_MIGRATION_MAP[cube]
 def properties(self):
 """return a result set containing system wide properties"""
 session = self.internal_session()
 try:
-return session.execute('Any K,V WHERE P is EProperty,'
+return session.execute('Any K,V WHERE P is CWProperty,'
 'P pkey K, P value V, NOT P for_user U',
 build_descr=False)
 finally:
 session.close()
 """
 session = self.internal_session()
 # for consistency, keep same error as unique check hook (although not required)
 errmsg = session._('the value "%s" is already used, use another one')
 try:
-if (session.execute('EUser X WHERE X login %(login)s', {'login': login})
+if (session.execute('CWUser X WHERE X login %(login)s', {'login': login})
-or session.execute('EUser X WHERE X use_email C, C address %(login)s',
+or session.execute('CWUser X WHERE X use_email C, C address %(login)s',
 {'login': login})):
 raise ValidationError(None, {'login': errmsg % login})
 # we have to create the user
-user = self.vreg.etype_class('EUser')(session, None)
+user = self.vreg.etype_class('CWUser')(session, None)
 if isinstance(password, unicode):
 # password should *always* be utf8 encoded
 password = password.encode('UTF8')
 kwargs['login'] = login
 kwargs['upassword'] = password

branch	tls-sprint
changeset 1398	5fe84a5f7035
parent 1372	d4264cd876e1
child 1482	93c613913912