kallithea Changeset - cfbc0d6860ca

Changeset - cfbc0d6860ca

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

domruf - 9 years ago 2017-05-09 21:29:17
dominikruf@gmail.com

sqlalchemy: be consistent, always use Session() instead of just Session

4 files changed with 7 insertions and 9 deletions:

kallithea/controllers/journal.py

kallithea/lib/auth.py

kallithea/tests/api/api_base.py

kallithea/tests/functional/test_pullrequests.py

0 comments (0 inline, 0 general)

kallithea/controllers/journal.py

➞

Show inline comments

@@ @@ -251,24 +251,24 @@ class JournalController(BaseController): @@
     def toggle_following(self):
         user_id = request.POST.get('follows_user_id')
         if user_id:
             try:
                 self.scm_model.toggle_following_user(user_id,
                                             request.authuser.user_id)
                 Session.commit()
+                Session().commit()
                 return 'ok'
             except Exception:
                 log.error(traceback.format_exc())
                 raise HTTPBadRequest()
         repo_id = request.POST.get('follows_repository_id')
         if repo_id:
             try:
                 self.scm_model.toggle_following_repo(repo_id,
                                             request.authuser.user_id)
                 Session.commit()
+                Session().commit()
                 return 'ok'
             except Exception:
                 log.error(traceback.format_exc())
                 raise HTTPBadRequest()
         raise HTTPBadRequest()

kallithea/lib/auth.py

➞

Show inline comments

@@ @@ -40,13 +40,12 @@ from sqlalchemy.orm.exc import ObjectDel @@
 from sqlalchemy.orm import joinedload
 from webob.exc import HTTPFound, HTTPBadRequest, HTTPForbidden, HTTPMethodNotAllowed
 from kallithea import __platform__, is_windows, is_unix
 from kallithea.config.routing import url
 from kallithea.lib.vcs.utils.lazy import LazyProperty
 from kallithea.model import meta
 from kallithea.model.meta import Session
 from kallithea.model.user import UserModel
 from kallithea.model.db import User, Repository, Permission, \
     UserToPerm, UserGroupRepoToPerm, UserGroupToPerm, UserGroupMember, \
     RepoGroup, UserGroupRepoGroupToPerm, UserIpMap, UserGroupUserGroupToPerm, \
     UserGroup, UserApiKeys
@@ @@ -721,17 +720,16 @@ def set_available_permissions(config): @@
     :param config: current config instance
     """
     log.info('getting information about all available permissions')
     try:
         sa = meta.Session
         all_perms = sa.query(Permission).all()
         all_perms = Session().query(Permission).all()
         config['available_permissions'] = [x.permission_name for x in all_perms]
     finally:
-        meta.Session.remove()
         Session.remove()
 #==============================================================================
 # CHECK DECORATORS
 #==============================================================================

kallithea/tests/api/api_base.py

➞

Show inline comments

@@ @@ -275,13 +275,13 @@ class _BaseTestApi(object): @@
         self._compare_error(id_, expected, given=response.body)
     def test_api_pull(self):
         repo_name = u'test_pull'
         r = fixture.create_repo(repo_name, repo_type=self.REPO_TYPE)
         r.clone_uri = os.path.join(Ui.get_by_key('paths', '/').ui_value, self.REPO)
         Session.commit()
+        Session().commit()
         id_, params = _build_data(self.apikey, 'pull',
                                   repoid=repo_name,)
         response = api_call(self, params)
         expected = {'msg': 'Pulled from `%s`' % repo_name,

kallithea/tests/functional/test_pullrequests.py

➞

Show inline comments

@@ @@ -293,18 +293,18 @@ class TestPullrequestsController(TestCon @@
 class TestPullrequestsGetRepoRefs(TestController):
     def setup_method(self, method):
         self.repo_name = u'main'
         repo = fixture.create_repo(self.repo_name, repo_type='hg')
         self.repo_scm_instance = repo.scm_instance
         Session.commit()
+        Session().commit()
         self.c = PullrequestsController()
     def teardown_method(self, method):
         fixture.destroy_repo(u'main')
         Session.commit()
+        Session().commit()
         Session.remove()
     def test_repo_refs_empty_repo(self):
         # empty repo with no commits, no branches, no bookmarks, just one tag
         refs, default = self.c._get_repo_refs(self.repo_scm_instance)
         assert default == 'tag:null:0000000000000000000000000000000000000000'

0 comments (0 inline, 0 general)