# HG changeset patch
# User Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
# Date 2017-03-15 21:20:24
# Node ID 4517e212f09ac50a300376c2ddc3044fab6a280a
# Parent  2f9313074853fe40e6f1c7d917dbee3e9b4695bf

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.

diff --git a/kallithea/controllers/admin/admin.py b/kallithea/controllers/admin/admin.py
--- a/kallithea/controllers/admin/admin.py
+++ b/kallithea/controllers/admin/admin.py
@@ -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):
diff --git a/kallithea/controllers/admin/auth_settings.py b/kallithea/controllers/admin/auth_settings.py
--- a/kallithea/controllers/admin/auth_settings.py
+++ b/kallithea/controllers/admin/auth_settings.py
@@ -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 = [
diff --git a/kallithea/controllers/admin/defaults.py b/kallithea/controllers/admin/defaults.py
--- a/kallithea/controllers/admin/defaults.py
+++ b/kallithea/controllers/admin/defaults.py
@@ -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()
diff --git a/kallithea/controllers/admin/my_account.py b/kallithea/controllers/admin/my_account.py
--- a/kallithea/controllers/admin/my_account.py
+++ b/kallithea/controllers/admin/my_account.py
@@ -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)
diff --git a/kallithea/controllers/admin/notifications.py b/kallithea/controllers/admin/notifications.py
--- a/kallithea/controllers/admin/notifications.py
+++ b/kallithea/controllers/admin/notifications.py
@@ -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
diff --git a/kallithea/controllers/admin/permissions.py b/kallithea/controllers/admin/permissions.py
--- a/kallithea/controllers/admin/permissions.py
+++ b/kallithea/controllers/admin/permissions.py
@@ -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'),),
diff --git a/kallithea/controllers/admin/repo_groups.py b/kallithea/controllers/admin/repo_groups.py
--- a/kallithea/controllers/admin/repo_groups.py
+++ b/kallithea/controllers/admin/repo_groups.py
@@ -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
diff --git a/kallithea/controllers/admin/repos.py b/kallithea/controllers/admin/repos.py
--- a/kallithea/controllers/admin/repos.py
+++ b/kallithea/controllers/admin/repos.py
@@ -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
diff --git a/kallithea/controllers/admin/settings.py b/kallithea/controllers/admin/settings.py
--- a/kallithea/controllers/admin/settings.py
+++ b/kallithea/controllers/admin/settings.py
@@ -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()
diff --git a/kallithea/controllers/admin/user_groups.py b/kallithea/controllers/admin/user_groups.py
--- a/kallithea/controllers/admin/user_groups.py
+++ b/kallithea/controllers/admin/user_groups.py
@@ -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):
diff --git a/kallithea/controllers/admin/users.py b/kallithea/controllers/admin/users.py
--- a/kallithea/controllers/admin/users.py
+++ b/kallithea/controllers/admin/users.py
@@ -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'):
diff --git a/kallithea/controllers/changelog.py b/kallithea/controllers/changelog.py
--- a/kallithea/controllers/changelog.py
+++ b/kallithea/controllers/changelog.py
@@ -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
diff --git a/kallithea/controllers/changeset.py b/kallithea/controllers/changeset.py
--- a/kallithea/controllers/changeset.py
+++ b/kallithea/controllers/changeset.py
@@ -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):
diff --git a/kallithea/controllers/compare.py b/kallithea/controllers/compare.py
--- a/kallithea/controllers/compare.py
+++ b/kallithea/controllers/compare.py
@@ -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
diff --git a/kallithea/controllers/error.py b/kallithea/controllers/error.py
--- a/kallithea/controllers/error.py
+++ b/kallithea/controllers/error.py
@@ -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
 
diff --git a/kallithea/controllers/feed.py b/kallithea/controllers/feed.py
--- a/kallithea/controllers/feed.py
+++ b/kallithea/controllers/feed.py
@@ -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)
diff --git a/kallithea/controllers/files.py b/kallithea/controllers/files.py
--- a/kallithea/controllers/files.py
+++ b/kallithea/controllers/files.py
@@ -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):
diff --git a/kallithea/controllers/journal.py b/kallithea/controllers/journal.py
--- a/kallithea/controllers/journal.py
+++ b/kallithea/controllers/journal.py
@@ -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):
diff --git a/kallithea/lib/base.py b/kallithea/lib/base.py
--- a/kallithea/lib/base.py
+++ b/kallithea/lib/base.py
@@ -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: