# HG changeset patch # User Thomas De Schampheleire # Date 2016-09-13 16:01:19 # Node ID 5eec79420ce3706e28f670addb7caa66ed004b2a # Parent f973b866fffc1cacbaa840641b1f7d8491a19bb5 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. diff --git a/kallithea/__init__.py b/kallithea/__init__.py --- a/kallithea/__init__.py +++ b/kallithea/__init__.py @@ -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 @@ BACKENDS = { CELERY_ON = False CELERY_EAGER = False -# link to config for pylons CONFIG = {} # Linked module for extensions 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 @@ -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: 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 @@ -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: diff --git a/kallithea/controllers/changeset.py b/kallithea/controllers/changeset.py --- a/kallithea/controllers/changeset.py +++ b/kallithea/controllers/changeset.py @@ -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: diff --git a/kallithea/controllers/compare.py b/kallithea/controllers/compare.py --- a/kallithea/controllers/compare.py +++ b/kallithea/controllers/compare.py @@ -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. diff --git a/kallithea/controllers/journal.py b/kallithea/controllers/journal.py --- a/kallithea/controllers/journal.py +++ b/kallithea/controllers/journal.py @@ -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: diff --git a/kallithea/lib/auth.py b/kallithea/lib/auth.py --- a/kallithea/lib/auth.py +++ b/kallithea/lib/auth.py @@ -679,12 +679,12 @@ class AuthUser(object): 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') diff --git a/kallithea/lib/hooks.py b/kallithea/lib/hooks.py --- a/kallithea/lib/hooks.py +++ b/kallithea/lib/hooks.py @@ -373,8 +373,8 @@ def handle_git_post_receive(repo_path, r 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: diff --git a/kallithea/lib/paster_commands/common.py b/kallithea/lib/paster_commands/common.py --- a/kallithea/lib/paster_commands/common.py +++ b/kallithea/lib/paster_commands/common.py @@ -85,7 +85,7 @@ class BasePasterCommand(Command): def bootstrap_config(self, conf): """ - Loads the pylons configuration. + Loads the app configuration. """ from pylons import config as pylonsconfig diff --git a/kallithea/lib/utils.py b/kallithea/lib/utils.py --- a/kallithea/lib/utils.py +++ b/kallithea/lib/utils.py @@ -378,7 +378,7 @@ def make_ui(read_from='file', path=None, def set_app_settings(config): """ - Updates pylons config with new settings from database + Updates app config with new settings from database :param config: """ diff --git a/kallithea/tests/__init__.py b/kallithea/tests/__init__.py --- a/kallithea/tests/__init__.py +++ b/kallithea/tests/__init__.py @@ -13,12 +13,7 @@ # along with this program. If not, see . """ -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. """