cubicweb: comparison server/repository.py

equal deleted inserted replaced

-:96b4f7a35e6c
+:ff9d6d269877
 self.sources_by_eid = {}
 if self.config.quick_start \
 or not 'CWSource' in self.schema: # # 3.10 migration
 self.system_source.init_creating()
 return
-session = self.internal_session()
+with self.internal_session() as session:
-try:
 # FIXME: sources should be ordered (add_entity priority)
 for sourceent in session.execute(
 'Any S, SN, SA, SC WHERE S is_instance_of CWSource, '
 'S name SN, S type SA, S config SC').entities():
 if sourceent.name == 'system':
 self.system_source.eid = sourceent.eid
 self.sources_by_eid[sourceent.eid] = self.system_source
 self.system_source.init(True, sourceent)
 continue
 self.add_source(sourceent, add_to_cnxsets=False)
-finally:
-session.close()
 def _clear_planning_caches(self):
 for cache in ('source_defs', 'is_multi_sources_relation',
 'can_cross_relation', 'rel_type_sources'):
 clear_cache(self, cache)
 from cubicweb.server.schemaserial import deserialize_schema
 self.info('loading schema from the repository')
 appschema = schema.CubicWebSchema(self.config.appid)
 self.set_schema(self.config.load_bootstrap_schema(), resetvreg=False)
 self.debug('deserializing db schema into %s %#x', appschema.name, id(appschema))
-session = self.internal_session()
+with self.internal_session() as session:
-try:
 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]
-finally:
-session.close()
 self.set_schema(appschema)
 def _prepare_startup(self):
 """Prepare "Repository as a server" for startup.
 This is a public method, not requiring a session id.
 """
 from logilab.common.changelog import Version
 vcconf = {}
-session = self.internal_session()
+with self.internal_session() as session:
-try:
 for pk, version in session.execute(
 '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
 fsversion = self.config.cubicweb_version()
 if version < fsversion:
 msg = ('instance has %s version %s but %s '
 'is installed. Run "cubicweb-ctl upgrade".')
 raise ExecutionError(msg % (cube, version, fsversion))
-finally:
-session.close()
 return vcconf
 @cached
 def source_defs(self):
 """Return the a dictionary containing source uris as value and a
 def properties(self):
 """Return a result set containing system wide properties.
 This is a public method, not requiring a session id.
 """
-session = self.internal_session()
+with self.internal_session() as session:
-try:
 # don't use session.execute, we don't want rset.req set
 return self.querier.execute(session, 'Any K,V WHERE P is CWProperty,'
 'P pkey K, P value V, NOT P for_user U',
 build_descr=False)
-finally:
-session.close()
 # XXX protect this method: anonymous should be allowed and registration
 # plugged
 def register_user(self, login, password, email=None, **kwargs):
 """check a user with the given login exists, if not create it with the
 given password. This method is designed to be used for anonymous
 registration on public web site.
 """
-session = self.internal_session()
+with self.internal_session() as 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('CWUser X WHERE X login %(login)s', {'login': login},
 build_descr=False)
 or session.execute('CWUser X WHERE X use_email C, C address %(login)s',
 {'login': login}, build_descr=False)):
 qname = role_name('login', 'subject')
 raise ValidationError(None, {qname: errmsg % d['email']})
 session.execute('INSERT EmailAddress X: X address %(email)s, '
 'U primary_email X, U use_email X '
 'WHERE U login %(login)s', d, build_descr=False)
 session.commit()
-finally:
-session.close()
 return True
 def find_users(self, fetch_attrs, **query_attrs):
 """yield user attributes for cwusers matching the given query_attrs
 (the result set cannot survive this method call)
 if not rschema.meta)
 cwuserattrs = self._cwuser_attrs
 for k in chain(fetch_attrs, query_attrs.iterkeys()):
 if k not in cwuserattrs:
 raise Exception('bad input for find_user')
-session = self.internal_session()
+with self.internal_session() as session:
-try:
 varmaker = rqlvar_maker()
 vars = [(attr, varmaker.next()) for attr in fetch_attrs]
 rql = 'Any %s WHERE X is CWUser, ' % ','.join(var[1] for var in vars)
 rql += ','.join('X %s %s' % (var[0], var[1]) for var in vars) + ','
 rset = session.execute(rql + ','.join('X %s %%(%s)s' % (attr, attr)
 for attr in query_attrs.iterkeys()),
 query_attrs)
 return rset.rows
-finally:
-session.close()
 def connect(self, login, **kwargs):
 """open a connection for a given user
 base_url may be needed to send mails
 raise `AuthenticationError` if the authentication failed
 raise `ConnectionError` if we can't open a connection
 """
 # use an internal connection
-session = self.internal_session()
+with self.internal_session() as session:
 # try to get a user object
 cnxprops = kwargs.pop('cnxprops', None)
-try:
 user = self.authenticate_user(session, login, **kwargs)
-finally:
-session.close()
 session = Session(user, self, cnxprops)
 user._cw = user.cw_rset.req = session
 user.cw_clear_relation_cache()
 self._sessions[session.id] = session
 self.info('opened session %s for user %s', session.id, login)
 modified since the given timestamp (actually entities whose full text
 index content has changed)
 * list of (etype, eid) of entities of the given types which have been
 deleted since the given timestamp
 """
-session = self.internal_session()
+with self.internal_session() as session:
 updatetime = datetime.utcnow()
-try:
 modentities, delentities = self.system_source.modified_entities(
 session, etypes, mtime)
 return updatetime, modentities, delentities
-finally:
-session.close()
 # session handling ########################################################
 def close_sessions(self):
 """close every opened sessions"""

changeset 8433	ff9d6d269877
parent 8393	77c7158916c1
child 8456	c912d82f2166