kallithea Changeset - 4517e212f09a

Changeset - 4517e212f09a

Parent rev.

Child rev.

[Not reviewed]

default

0 19 0

Thomas De Schampheleire - 9 years ago 2017-03-15 21:20:24
thomas.de.schampheleire@gmail.com

controllers: rename __before__ to _before in preparation of TurboGears2

__before__ in Pylons is called _before in TurboGears2. We can prepare this
rename already in Pylons-based Kallithea, so that the real TG2 migration
commit just changes the BaseController.

Since TurboGears2 _before can pass extra arguments, we add *args and
**kwargs parameters as well.

19 files changed with 47 insertions and 37 deletions:

kallithea/controllers/admin/admin.py

kallithea/controllers/admin/auth_settings.py

kallithea/controllers/admin/defaults.py

kallithea/controllers/admin/my_account.py

kallithea/controllers/admin/notifications.py

kallithea/controllers/admin/permissions.py

kallithea/controllers/admin/repo_groups.py

kallithea/controllers/admin/repos.py

kallithea/controllers/admin/settings.py

kallithea/controllers/admin/user_groups.py

kallithea/controllers/admin/users.py

kallithea/controllers/changelog.py

kallithea/controllers/changeset.py

kallithea/controllers/compare.py

kallithea/controllers/error.py

kallithea/controllers/feed.py

kallithea/controllers/files.py

kallithea/controllers/journal.py

kallithea/lib/base.py

0 comments (0 inline, 0 general)

kallithea/controllers/admin/admin.py

➞

Show inline comments

@@ @@ -121,8 +121,8 @@ def _journal_filter(user_log, search_ter @@
 class AdminController(BaseController):
     @LoginRequired()
     def __before__(self):
         super(AdminController, self).__before__()
     def _before(self, *args, **kwargs):
         super(AdminController, self)._before(*args, **kwargs)
     @HasPermissionAnyDecorator('hg.admin')
     def index(self):

kallithea/controllers/admin/auth_settings.py

➞

Show inline comments

@@ @@ -48,8 +48,8 @@ class AuthSettingsController(BaseControl @@
     @LoginRequired()
     @HasPermissionAnyDecorator('hg.admin')
     def __before__(self):
         super(AuthSettingsController, self).__before__()
     def _before(self, *args, **kwargs):
         super(AuthSettingsController, self)._before(*args, **kwargs)
     def __load_defaults(self):
         c.available_plugins = [

kallithea/controllers/admin/defaults.py

➞

Show inline comments

@@ @@ -50,8 +50,8 @@ class DefaultsController(BaseController) @@
     @LoginRequired()
     @HasPermissionAnyDecorator('hg.admin')
     def __before__(self):
         super(DefaultsController, self).__before__()
     def _before(self, *args, **kwargs):
         super(DefaultsController, self)._before(*args, **kwargs)
     def index(self, format='html'):
         c.backends = BACKENDS.keys()

kallithea/controllers/admin/my_account.py

➞

Show inline comments

@@ @@ -60,8 +60,8 @@ class MyAccountController(BaseController @@
     @LoginRequired()
     @NotAnonymous()
     def __before__(self):
         super(MyAccountController, self).__before__()
     def _before(self, *args, **kwargs):
         super(MyAccountController, self)._before(*args, **kwargs)
     def __load_data(self):
         c.user = User.get(request.authuser.user_id)

kallithea/controllers/admin/notifications.py

➞

Show inline comments

@@ @@ -54,8 +54,8 @@ class NotificationsController(BaseContro @@
     @LoginRequired()
     @NotAnonymous()
     def __before__(self):
         super(NotificationsController, self).__before__()
     def _before(self, *args, **kwargs):
         super(NotificationsController, self)._before(*args, **kwargs)
     def index(self, format='html'):
         c.user = request.authuser

kallithea/controllers/admin/permissions.py

➞

Show inline comments

@@ @@ -55,8 +55,8 @@ class PermissionsController(BaseControll @@
     @LoginRequired()
     @HasPermissionAnyDecorator('hg.admin')
     def __before__(self):
         super(PermissionsController, self).__before__()
     def _before(self, *args, **kwargs):
         super(PermissionsController, self)._before(*args, **kwargs)
     def __load_data(self):
         c.repo_perms_choices = [('repository.none', _('None'),),

kallithea/controllers/admin/repo_groups.py

➞

Show inline comments

@@ @@ -59,8 +59,8 @@ log = logging.getLogger(__name__) @@
 class RepoGroupsController(BaseController):
     @LoginRequired()
     def __before__(self):
         super(RepoGroupsController, self).__before__()
     def _before(self, *args, **kwargs):
         super(RepoGroupsController, self)._before(*args, **kwargs)
     def __load_defaults(self, extras=(), exclude=()):
         """extras is used for keeping current parent ignoring permissions

kallithea/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -61,8 +61,8 @@ class ReposController(BaseRepoController @@
     #     map.resource('repo', 'repos')
     @LoginRequired()
     def __before__(self):
         super(ReposController, self).__before__()
     def _before(self, *args, **kwargs):
         super(ReposController, self)._before(*args, **kwargs)
     def _load_repo(self):
         repo_obj = c.db_repo

kallithea/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -59,8 +59,8 @@ class SettingsController(BaseController) @@
     #         path_prefix='/admin', name_prefix='admin_')
     @LoginRequired()
     def __before__(self):
         super(SettingsController, self).__before__()
     def _before(self, *args, **kwargs):
         super(SettingsController, self)._before(*args, **kwargs)
     def _get_hg_ui_settings(self):
         ret = Ui.query().all()

kallithea/controllers/admin/user_groups.py

➞

Show inline comments

@@ @@ -64,8 +64,8 @@ class UserGroupsController(BaseControlle @@
     """REST Controller styled on the Atom Publishing Protocol"""
     @LoginRequired()
     def __before__(self):
         super(UserGroupsController, self).__before__()
     def _before(self, *args, **kwargs):
         super(UserGroupsController, self)._before(*args, **kwargs)
         c.available_permissions = config['available_permissions']
     def __load_data(self, user_group_id):

kallithea/controllers/admin/users.py

➞

Show inline comments

@@ @@ -61,8 +61,8 @@ class UsersController(BaseController): @@
     @LoginRequired()
     @HasPermissionAnyDecorator('hg.admin')
     def __before__(self):
         super(UsersController, self).__before__()
     def _before(self, *args, **kwargs):
         super(UsersController, self)._before(*args, **kwargs)
         c.available_permissions = config['available_permissions']
     def index(self, format='html'):

kallithea/controllers/changelog.py

➞

Show inline comments

@@ @@ -67,8 +67,8 @@ def _load_changelog_summary(): @@
 class ChangelogController(BaseRepoController):
     def __before__(self):
         super(ChangelogController, self).__before__()
     def _before(self, *args, **kwargs):
         super(ChangelogController, self)._before(*args, **kwargs)
         c.affected_files_cut_off = 60
     @staticmethod

kallithea/controllers/changeset.py

➞

Show inline comments

@@ @@ -192,8 +192,8 @@ def create_comment(text, status, f_path, @@
 class ChangesetController(BaseRepoController):
     def __before__(self):
         super(ChangesetController, self).__before__()
     def _before(self, *args, **kwargs):
         super(ChangesetController, self)._before(*args, **kwargs)
         c.affected_files_cut_off = 60
     def __load_data(self):

kallithea/controllers/compare.py

➞

Show inline comments

@@ @@ -51,8 +51,8 @@ log = logging.getLogger(__name__) @@
 class CompareController(BaseRepoController):
     def __before__(self):
         super(CompareController, self).__before__()
     def _before(self, *args, **kwargs):
         super(CompareController, self)._before(*args, **kwargs)
         # The base repository has already been retrieved.
         c.a_repo = c.db_repo

kallithea/controllers/error.py

➞

Show inline comments

@@ @@ -48,7 +48,7 @@ class ErrorController(BaseController): @@
     ErrorDocuments middleware in your config/middleware.py file.
     """
-    def __before__(self):
+    def _before(self, *args, **kwargs):
         # disable all base actions since we don't need them here
         pass

kallithea/controllers/feed.py

➞

Show inline comments

@@ @@ -53,8 +53,8 @@ class FeedController(BaseRepoController) @@
     @LoginRequired(api_access=True)
     @HasRepoPermissionLevelDecorator('read')
     def __before__(self):
         super(FeedController, self).__before__()
     def _before(self, *args, **kwargs):
         super(FeedController, self)._before(*args, **kwargs)
     def _get_title(self, cs):
         return h.shorter(cs.message, 160)

kallithea/controllers/files.py

➞

Show inline comments

@@ @@ -69,8 +69,8 @@ log = logging.getLogger(__name__) @@
 class FilesController(BaseRepoController):
     def __before__(self):
         super(FilesController, self).__before__()
     def _before(self, *args, **kwargs):
         super(FilesController, self)._before(*args, **kwargs)
         c.cut_off_limit = self.cut_off_limit
     def __get_cs(self, rev, silent_empty=False):

kallithea/controllers/journal.py

➞

Show inline comments

@@ @@ -61,8 +61,8 @@ feed_nr = 20 @@
 class JournalController(BaseController):
     def __before__(self):
         super(JournalController, self).__before__()
     def _before(self, *args, **kwargs):
         super(JournalController, self)._before(*args, **kwargs)
         c.search_term = request.GET.get('filter')
     def _get_daily_aggregate(self, journal):

kallithea/lib/base.py

➞

Show inline comments

@@ @@ -377,6 +377,9 @@ class BaseVCSController(object): @@
 class BaseController(WSGIController):
     def _before(self, *args, **kwargs):
         pass
     def __before__(self):
         """
         __before__ is called before controller methods and after __call__
@@ @@ -434,6 +437,13 @@ class BaseController(WSGIController): @@
         self.scm_model = ScmModel()
         # __before__ in Pylons is called _before in TurboGears2. As preparation
         # to the migration to TurboGears2, all __before__ methods were already
         # renamed to _before.  We call them from here to keep the behavior.
         # This is a temporary call that will be removed in the real TurboGears2
         # migration commit.
         self._before()
     @staticmethod
     def _determine_auth_user(api_key, bearer_token, session_authuser):
         """
@@ @@ -573,8 +583,8 @@ class BaseRepoController(BaseController) @@
     c.repository_following: weather the current user is following the current repo
     """
     def __before__(self):
         super(BaseRepoController, self).__before__()
     def _before(self, *args, **kwargs):
         super(BaseRepoController, self)._before(*args, **kwargs)
         if c.repo_name:  # extracted from routes
             _dbr = Repository.get_by_repo_name(c.repo_name)
             if not _dbr:

0 comments (0 inline, 0 general)