Mercurial > kallithea
changeset 6215:5eec79420ce3
Turbogears2 migration: remove some references to Pylons in comments
In order to minimize the diff of the actual Turbogears2 migration, this
commit already removes certain unnecessary references to Pylons from the
Kallithea source base.
Places where the reference to Pylons is important are still kept for now, as
well as references in kallithea/config where many changes are made for
Turbogears2 anyway.
author | Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> |
---|---|
date | Tue, 13 Sep 2016 18:01:19 +0200 |
parents | f973b866fffc |
children | 49c82acd30b2 |
files | kallithea/__init__.py kallithea/controllers/admin/user_groups.py kallithea/controllers/admin/users.py kallithea/controllers/changeset.py kallithea/controllers/compare.py kallithea/controllers/journal.py kallithea/lib/auth.py kallithea/lib/hooks.py kallithea/lib/paster_commands/common.py kallithea/lib/utils.py kallithea/tests/__init__.py |
diffstat | 11 files changed, 15 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/__init__.py Mon Aug 22 17:50:51 2016 +0200 +++ b/kallithea/__init__.py Tue Sep 13 18:01:19 2016 +0200 @@ -15,8 +15,9 @@ kallithea ~~~~~~~~~ -Kallithea, a web based repository management based on pylons -versioning implementation: http://www.python.org/dev/peps/pep-0386/ +Kallithea, a web based repository management system. + +Versioning implementation: http://www.python.org/dev/peps/pep-0386/ This file was forked by the Kallithea project in July 2014. Original author and date, and relevant copyright and licensing information is below: @@ -38,7 +39,6 @@ CELERY_ON = False CELERY_EAGER = False -# link to config for pylons CONFIG = {} # Linked module for extensions
--- a/kallithea/controllers/admin/user_groups.py Mon Aug 22 17:50:51 2016 +0200 +++ b/kallithea/controllers/admin/user_groups.py Tue Sep 13 18:01:19 2016 +0200 @@ -15,7 +15,7 @@ kallithea.controllers.admin.user_groups ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -User Groups crud controller for pylons +User Groups crud controller This file was forked by the Kallithea project in July 2014. Original author and date, and relevant copyright and licensing information is below:
--- a/kallithea/controllers/admin/users.py Mon Aug 22 17:50:51 2016 +0200 +++ b/kallithea/controllers/admin/users.py Tue Sep 13 18:01:19 2016 +0200 @@ -15,7 +15,7 @@ kallithea.controllers.admin.users ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Users crud controller for pylons +Users crud controller This file was forked by the Kallithea project in July 2014. Original author and date, and relevant copyright and licensing information is below:
--- a/kallithea/controllers/changeset.py Mon Aug 22 17:50:51 2016 +0200 +++ b/kallithea/controllers/changeset.py Tue Sep 13 18:01:19 2016 +0200 @@ -15,8 +15,7 @@ kallithea.controllers.changeset ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -changeset controller for pylons showing changes between -revisions +changeset controller showing changes between revisions This file was forked by the Kallithea project in July 2014. Original author and date, and relevant copyright and licensing information is below:
--- a/kallithea/controllers/compare.py Mon Aug 22 17:50:51 2016 +0200 +++ b/kallithea/controllers/compare.py Tue Sep 13 18:01:19 2016 +0200 @@ -15,7 +15,7 @@ kallithea.controllers.compare ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -compare controller for pylons showing differences between two +compare controller showing differences between two repos, branches, bookmarks or tips This file was forked by the Kallithea project in July 2014.
--- a/kallithea/controllers/journal.py Mon Aug 22 17:50:51 2016 +0200 +++ b/kallithea/controllers/journal.py Tue Sep 13 18:01:19 2016 +0200 @@ -15,7 +15,7 @@ kallithea.controllers.journal ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Journal controller for pylons +Journal controller This file was forked by the Kallithea project in July 2014. Original author and date, and relevant copyright and licensing information is below:
--- a/kallithea/lib/auth.py Mon Aug 22 17:50:51 2016 +0200 +++ b/kallithea/lib/auth.py Tue Sep 13 18:01:19 2016 +0200 @@ -679,12 +679,12 @@ def set_available_permissions(config): """ - This function will propagate pylons globals with all available defined + This function will propagate globals with all available defined permission given in db. We don't want to check each time from db for new permissions since adding a new permission also requires application restart ie. to decorate new views with the newly created permission - :param config: current pylons config instance + :param config: current config instance """ log.info('getting information about all available permissions')
--- a/kallithea/lib/hooks.py Mon Aug 22 17:50:51 2016 +0200 +++ b/kallithea/lib/hooks.py Tue Sep 13 18:01:19 2016 +0200 @@ -373,8 +373,8 @@ def handle_git_receive(repo_path, revs, env, hook_type): """ A really hacky method that is run by git post-receive hook and logs - an push action together with pushed revisions. It's executed by subprocess - thus needs all info to be able to create a on the fly pylons environment, + a push action together with pushed revisions. It's executed by subprocess + thus needs all info to be able to create an on the fly app environment, connect to database and run the logging code. Hacky as sh*t but works. :param repo_path:
--- a/kallithea/lib/paster_commands/common.py Mon Aug 22 17:50:51 2016 +0200 +++ b/kallithea/lib/paster_commands/common.py Tue Sep 13 18:01:19 2016 +0200 @@ -85,7 +85,7 @@ def bootstrap_config(self, conf): """ - Loads the pylons configuration. + Loads the app configuration. """ from pylons import config as pylonsconfig
--- a/kallithea/lib/utils.py Mon Aug 22 17:50:51 2016 +0200 +++ b/kallithea/lib/utils.py Tue Sep 13 18:01:19 2016 +0200 @@ -378,7 +378,7 @@ def set_app_settings(config): """ - Updates pylons config with new settings from database + Updates app config with new settings from database :param config: """
--- a/kallithea/tests/__init__.py Mon Aug 22 17:50:51 2016 +0200 +++ b/kallithea/tests/__init__.py Tue Sep 13 18:01:19 2016 +0200 @@ -13,12 +13,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. """ -Pylons application test package - -This package assumes the Pylons environment is already loaded. - -This module initializes the application via ``websetup`` (`paster -setup-app`) and provides the base testing objects. +Kallithea test package Refer to docs/contributing.rst for details on running the test suite. """