kallithea Changeset - 1e52ed5c37aa

Changeset - 1e52ed5c37aa

Parent rev.

Child rev.

[Not reviewed]

default

0 7 0

Søren Løvborg - 9 years ago 2016-08-03 15:31:23
sorenl@unity3d.com

db: remove deprecated getAll method

Not sure why this wasn't done immediately when get_all was added. Maybe
search and replace was out of order at the time.

7 files changed with 7 insertions and 12 deletions:

kallithea/controllers/api/api.py

kallithea/lib/paster_commands/update_repoinfo.py

kallithea/model/__init__.py

kallithea/model/db.py

kallithea/model/repo.py

kallithea/tests/functional/test_home.py

kallithea/tests/other/manual_test_vcs_operations.py

0 comments (0 inline, 0 general)

kallithea/controllers/api/api.py

➞

Show inline comments

@@ @@ -454,13 +454,13 @@ class ApiController(JSONRPCController): @@
         if isinstance(userid, Optional):
             user = None
         else:
             user = get_user_or_error(userid)
         # show all locks
-        for r in Repository.getAll():
+        for r in Repository.get_all():
             userid, time_ = r.locked
             if time_:
                 _api_data = r.get_api_data()
                 # if we use userfilter just show the locks for this user
                 if user is not None:
                     if safe_int(userid) == user.user_id:

kallithea/lib/paster_commands/update_repoinfo.py

➞

Show inline comments

@@ @@ -56,13 +56,13 @@ class Command(BasePasterCommand): @@
     def command(self):
         #get SqlAlchemy session
         self._init_session()
         if self.options.repo_update_list is None:
-            repo_list = Repository.getAll()
+            repo_list = Repository.get_all()
         else:
             repo_names = [safe_unicode(n.strip())
                           for n in self.options.repo_update_list.split(',')]
             repo_list = list(Repository.query()
                 .filter(Repository.repo_name.in_(repo_names)))
         RepoModel.update_repoinfo(repositories=repo_list)

kallithea/model/__init__.py

➞

Show inline comments

@@ @@ -135,7 +135,7 @@ class BaseModel(object): @@
     @classmethod
     def get_all(cls):
         """
         Returns all instances of what is defined in `cls` class variable
         """
-        return cls.cls.getAll()
+        return cls.cls.get_all()

kallithea/model/db.py

➞

Show inline comments

@@ @@ -131,17 +131,12 @@ class BaseModel(object): @@
         res = cls.query().get(id_)
         if res is None:
             raise HTTPNotFound
         return res
     @classmethod
     def getAll(cls):
         # deprecated and left for backward compatibility
         return cls.get_all()
     @classmethod
     def get_all(cls):
         return cls.query().all()
     @classmethod
     def delete(cls, id_):
         obj = cls.query().get(id_)

kallithea/model/repo.py

➞

Show inline comments

@@ @@ -177,13 +177,13 @@ class RepoModel(BaseModel): @@
         kwargs.update(dict(_=_, h=h, c=c))
         return tmpl.render(*args, **kwargs)
     @classmethod
     def update_repoinfo(cls, repositories=None):
         if repositories is None:
-            repositories = Repository.getAll()
+            repositories = Repository.get_all()
         for repo in repositories:
             repo.update_changeset_cache()
     def get_repos_as_dict(self, repos_list=None, admin=False, perm_check=True,
                           super_user_actions=False, short_name=False):
         _render = self._render_datatable

kallithea/tests/functional/test_home.py

➞

Show inline comments

@@ @@ -14,13 +14,13 @@ class TestHomeController(TestController) @@
     def test_index(self):
         self.log_user()
         response = self.app.get(url(controller='home', action='index'))
         #if global permission is set
         response.mustcontain('Add Repository')
         # html in javascript variable:
-        response.mustcontain('var data = {"totalRecords": %s' % len(Repository.getAll()))
+        response.mustcontain('var data = {"totalRecords": %s' % len(Repository.get_all()))
         response.mustcontain(r'href=\"/%s\"' % HG_REPO)
         response.mustcontain(r'<span class="repotag">git')
         response.mustcontain(r'<i class=\"icon-globe\"')
         response.mustcontain("""fixes issue with having custom format for git-log""")

kallithea/tests/other/manual_test_vcs_operations.py

➞

Show inline comments

@@ @@ -524,13 +524,13 @@ class TestVCSOperations(TestController): @@
             Session().commit()
             clone_url = _construct_url(HG_REPO)
             stdout, stderr = Command(tempfile.gettempdir()).execute('hg clone', clone_url)
             assert 'abort: HTTP Error 403: Forbidden' in stderr
         finally:
             #release IP restrictions
-            for ip in UserIpMap.getAll():
+            for ip in UserIpMap.get_all():
                 UserIpMap.delete(ip.ip_id)
             Session().commit()
         time.sleep(2)
         clone_url = _construct_url(HG_REPO)
         stdout, stderr = Command(tempfile.gettempdir()).execute('hg clone', clone_url)
@@ @@ -550,13 +550,13 @@ class TestVCSOperations(TestController): @@
             clone_url = _construct_url(GIT_REPO)
             stdout, stderr = Command(tempfile.gettempdir()).execute('git clone', clone_url)
             # The message apparently changed in Git 1.8.3, so match it loosely.
             assert re.search(r'\b403\b', stderr)
         finally:
             #release IP restrictions
-            for ip in UserIpMap.getAll():
+            for ip in UserIpMap.get_all():
                 UserIpMap.delete(ip.ip_id)
             Session().commit()
         time.sleep(2)
         clone_url = _construct_url(GIT_REPO)
         stdout, stderr = Command(tempfile.gettempdir()).execute('git clone', clone_url)

0 comments (0 inline, 0 general)