Mercurial > kallithea
changeset 6558:4517e212f09a
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.
| author | Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> |
|---|---|
| date | Wed, 15 Mar 2017 21:20:24 +0100 |
| parents | 2f9313074853 |
| children | 0948ff2e1c83 |
| files | 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 |
| diffstat | 19 files changed, 47 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/admin/admin.py Wed Mar 15 21:00:40 2017 +0100 +++ b/kallithea/controllers/admin/admin.py Wed Mar 15 21:20:24 2017 +0100 @@ -121,8 +121,8 @@ 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):
--- a/kallithea/controllers/admin/auth_settings.py Wed Mar 15 21:00:40 2017 +0100 +++ b/kallithea/controllers/admin/auth_settings.py Wed Mar 15 21:20:24 2017 +0100 @@ -48,8 +48,8 @@ @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 = [
--- a/kallithea/controllers/admin/defaults.py Wed Mar 15 21:00:40 2017 +0100 +++ b/kallithea/controllers/admin/defaults.py Wed Mar 15 21:20:24 2017 +0100 @@ -50,8 +50,8 @@ @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()
--- a/kallithea/controllers/admin/my_account.py Wed Mar 15 21:00:40 2017 +0100 +++ b/kallithea/controllers/admin/my_account.py Wed Mar 15 21:20:24 2017 +0100 @@ -60,8 +60,8 @@ @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)
--- a/kallithea/controllers/admin/notifications.py Wed Mar 15 21:00:40 2017 +0100 +++ b/kallithea/controllers/admin/notifications.py Wed Mar 15 21:20:24 2017 +0100 @@ -54,8 +54,8 @@ @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
--- a/kallithea/controllers/admin/permissions.py Wed Mar 15 21:00:40 2017 +0100 +++ b/kallithea/controllers/admin/permissions.py Wed Mar 15 21:20:24 2017 +0100 @@ -55,8 +55,8 @@ @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'),),
--- a/kallithea/controllers/admin/repo_groups.py Wed Mar 15 21:00:40 2017 +0100 +++ b/kallithea/controllers/admin/repo_groups.py Wed Mar 15 21:20:24 2017 +0100 @@ -59,8 +59,8 @@ 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
--- a/kallithea/controllers/admin/repos.py Wed Mar 15 21:00:40 2017 +0100 +++ b/kallithea/controllers/admin/repos.py Wed Mar 15 21:20:24 2017 +0100 @@ -61,8 +61,8 @@ # 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
--- a/kallithea/controllers/admin/settings.py Wed Mar 15 21:00:40 2017 +0100 +++ b/kallithea/controllers/admin/settings.py Wed Mar 15 21:20:24 2017 +0100 @@ -59,8 +59,8 @@ # 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()
--- a/kallithea/controllers/admin/user_groups.py Wed Mar 15 21:00:40 2017 +0100 +++ b/kallithea/controllers/admin/user_groups.py Wed Mar 15 21:20:24 2017 +0100 @@ -64,8 +64,8 @@ """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):
--- a/kallithea/controllers/admin/users.py Wed Mar 15 21:00:40 2017 +0100 +++ b/kallithea/controllers/admin/users.py Wed Mar 15 21:20:24 2017 +0100 @@ -61,8 +61,8 @@ @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'):
--- a/kallithea/controllers/changelog.py Wed Mar 15 21:00:40 2017 +0100 +++ b/kallithea/controllers/changelog.py Wed Mar 15 21:20:24 2017 +0100 @@ -67,8 +67,8 @@ 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
--- a/kallithea/controllers/changeset.py Wed Mar 15 21:00:40 2017 +0100 +++ b/kallithea/controllers/changeset.py Wed Mar 15 21:20:24 2017 +0100 @@ -192,8 +192,8 @@ 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):
--- a/kallithea/controllers/compare.py Wed Mar 15 21:00:40 2017 +0100 +++ b/kallithea/controllers/compare.py Wed Mar 15 21:20:24 2017 +0100 @@ -51,8 +51,8 @@ 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
--- a/kallithea/controllers/error.py Wed Mar 15 21:00:40 2017 +0100 +++ b/kallithea/controllers/error.py Wed Mar 15 21:20:24 2017 +0100 @@ -48,7 +48,7 @@ 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
--- a/kallithea/controllers/feed.py Wed Mar 15 21:00:40 2017 +0100 +++ b/kallithea/controllers/feed.py Wed Mar 15 21:20:24 2017 +0100 @@ -53,8 +53,8 @@ @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)
--- a/kallithea/controllers/files.py Wed Mar 15 21:00:40 2017 +0100 +++ b/kallithea/controllers/files.py Wed Mar 15 21:20:24 2017 +0100 @@ -69,8 +69,8 @@ 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):
--- a/kallithea/controllers/journal.py Wed Mar 15 21:00:40 2017 +0100 +++ b/kallithea/controllers/journal.py Wed Mar 15 21:20:24 2017 +0100 @@ -61,8 +61,8 @@ 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):
--- a/kallithea/lib/base.py Wed Mar 15 21:00:40 2017 +0100 +++ b/kallithea/lib/base.py Wed Mar 15 21:20:24 2017 +0100 @@ -377,6 +377,9 @@ 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 @@ 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 @@ 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: