# HG changeset patch # User Marcin Kuzminski # Date 1301939011 -7200 # Node ID f4807acf643dd0f3dab0cdd9b49831d5c27a1f7c # Parent faf31099a70aa4f3cc4eb27fed65b1d69548ded4 added __license__ into main of rhodecode, PEP8ify diff -r faf31099a70a -r f4807acf643d rhodecode/__init__.py --- a/rhodecode/__init__.py Sun Apr 03 18:49:12 2011 +0200 +++ b/rhodecode/__init__.py Mon Apr 04 19:43:31 2011 +0200 @@ -31,9 +31,10 @@ __version__ = '.'.join((str(each) for each in VERSION[:4])) __dbversion__ = 3 #defines current db version for migrations __platform__ = platform.system() +__license__ = 'GPLv3' -PLATFORM_WIN = ('Windows',) -PLATFORM_OTHERS = ('Linux', 'Darwin', 'FreeBSD',) +PLATFORM_WIN = ('Windows') +PLATFORM_OTHERS = ('Linux', 'Darwin', 'FreeBSD') try: from rhodecode.lib.utils import get_current_revision @@ -45,6 +46,7 @@ if len(VERSION) > 3 and _rev: __version__ += ' [rev:%s]' % _rev[0] + def get_version(): """Returns shorter version (digit parts only) as string.""" diff -r faf31099a70a -r f4807acf643d rhodecode/config/environment.py --- a/rhodecode/config/environment.py Sun Apr 03 18:49:12 2011 +0200 +++ b/rhodecode/config/environment.py Mon Apr 04 19:43:31 2011 +0200 @@ -21,6 +21,7 @@ log = logging.getLogger(__name__) + def load_environment(global_conf, app_conf, initial=False): """Configure the Pylons environment via the ``pylons.config`` object @@ -67,7 +68,7 @@ if config['debug'] and not test: #use query time debugging. sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.', - proxy=TimerProxy()) + proxy=TimerProxy()) else: sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.') diff -r faf31099a70a -r f4807acf643d rhodecode/config/middleware.py --- a/rhodecode/config/middleware.py Sun Apr 03 18:49:12 2011 +0200 +++ b/rhodecode/config/middleware.py Mon Apr 04 19:43:31 2011 +0200 @@ -16,6 +16,7 @@ from rhodecode.lib.middleware.https_fixup import HttpsFixup from rhodecode.config.environment import load_environment + def make_app(global_conf, full_stack=True, static_files=True, **app_conf): """Create a Pylons WSGI application and return it diff -r faf31099a70a -r f4807acf643d rhodecode/config/routing.py --- a/rhodecode/config/routing.py Sun Apr 03 18:49:12 2011 +0200 +++ b/rhodecode/config/routing.py Mon Apr 04 19:43:31 2011 +0200 @@ -9,6 +9,7 @@ from routes import Mapper from rhodecode.lib.utils import check_repo_fast as cr + def make_map(config): """Create, configure and return the routes Mapper""" routes_map = Mapper(directory=config['pylons.paths']['controllers'], @@ -39,7 +40,6 @@ routes_map.connect('home', '/', controller='home', action='index') routes_map.connect('repo_switcher', '/repos', controller='home', action='repo_switcher') routes_map.connect('bugtracker', "http://bitbucket.org/marcinkuzminski/rhodecode/issues", _static=True) - routes_map.connect('gpl_license', "http://www.gnu.org/licenses/gpl.html", _static=True) routes_map.connect('rhodecode_official', "http://rhodecode.org", _static=True) #ADMIN REPOSITORY REST ROUTES @@ -114,7 +114,7 @@ ##ADMIN LDAP SETTINGS routes_map.connect('ldap_settings', '/_admin/ldap', controller='admin/ldap_settings', action='ldap_settings', conditions=dict(method=["POST"])) - routes_map.connect('ldap_home', '/_admin/ldap', controller='admin/ldap_settings',) + routes_map.connect('ldap_home', '/_admin/ldap', controller='admin/ldap_settings') #ADMIN SETTINGS REST ROUTES @@ -156,7 +156,7 @@ #USER JOURNAL - routes_map.connect('journal', '/_admin/journal', controller='journal',) + routes_map.connect('journal', '/_admin/journal', controller='journal') routes_map.connect('public_journal', '/_admin/public_journal', controller='journal', action="public_journal") routes_map.connect('public_journal_rss', '/_admin/public_journal_rss', controller='journal', action="public_journal_rss") routes_map.connect('public_journal_atom', '/_admin/public_journal_atom', controller='journal', action="public_journal_atom") @@ -166,7 +166,7 @@ #SEARCH - routes_map.connect('search', '/_admin/search', controller='search',) + routes_map.connect('search', '/_admin/search', controller='search') routes_map.connect('search_repo', '/_admin/search/{search_repo:.*}', controller='search') #LOGIN/LOGOUT/REGISTER/SIGN IN diff -r faf31099a70a -r f4807acf643d rhodecode/templates/base/base.html --- a/rhodecode/templates/base/base.html Sun Apr 03 18:49:12 2011 +0200 +++ b/rhodecode/templates/base/base.html Mon Apr 04 19:43:31 2011 +0200 @@ -70,9 +70,6 @@

${_('Submit a bug')}

-

- ${_('GPL license')} -

RhodeCode ${c.rhodecode_version} © 2010-${h.datetime.today().year} by Marcin Kuzminski diff -r faf31099a70a -r f4807acf643d rhodecode/websetup.py --- a/rhodecode/websetup.py Sun Apr 03 18:49:12 2011 +0200 +++ b/rhodecode/websetup.py Mon Apr 04 19:43:31 2011 +0200 @@ -34,10 +34,12 @@ log = logging.getLogger(__name__) + def setup_app(command, conf, vars): """Place any commands to setup rhodecode here""" dbconf = conf['sqlalchemy.db1.url'] - dbmanage = DbManage(log_sql=True, dbconf=dbconf, root=conf['here'], tests=False) + dbmanage = DbManage(log_sql=True, dbconf=dbconf, root=conf['here'], + tests=False) dbmanage.create_tables(override=True) dbmanage.set_db_version() dbmanage.create_settings(dbmanage.config_prompt(None)) diff -r faf31099a70a -r f4807acf643d setup.py --- a/setup.py Sun Apr 03 18:49:12 2011 +0200 +++ b/setup.py Mon Apr 04 19:43:31 2011 +0200 @@ -1,6 +1,7 @@ import sys from rhodecode import get_version from rhodecode import __platform__ +from rhodecode import __license__ py_version = sys.version_info @@ -25,7 +26,6 @@ 'Environment :: Web Environment', 'Framework :: Pylons', 'Intended Audience :: Developers', - 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 2.5', @@ -81,7 +81,7 @@ description=description, long_description=long_description, keywords=keywords, - license='GPLv3', + license=__license__, author='Marcin Kuzminski', author_email='marcin@python-works.com', url='http://rhodecode.org',