added __license__ into main of rhodecode, PEP8ify

--HG--
branch : beta

7 files changed, 16 insertions, 13 deletions

diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py
index d9b0b6fb..759c98fa 100644
--- a/rhodecode/__init__.py
+++ b/rhodecode/__init__.py
@@ -31,9 +31,10 @@ VERSION = (1, 2, 0, 'beta')
 __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 @@ except ImportError:
 if len(VERSION) > 3 and _rev:
     __version__ += ' [rev:%s]' % _rev[0]
 
+
 def get_version():
     """Returns shorter version (digit parts only) as string."""
 
diff --git a/rhodecode/config/environment.py b/rhodecode/config/environment.py
index e7224208..02fc639d 100644
--- a/rhodecode/config/environment.py
+++ b/rhodecode/config/environment.py
@@ -21,6 +21,7 @@ from rhodecode.lib.timerproxy import TimerProxy
 
 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 @@ def load_environment(global_conf, app_conf, initial=False):
     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 --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
index 48928cc4..7616dc10 100644
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -16,6 +16,7 @@ from rhodecode.lib.middleware.simplegit import SimpleGit
 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 --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py
index 811ec828..05ae3bfd 100644
--- a/rhodecode/config/routing.py
+++ b/rhodecode/config/routing.py
@@ -9,6 +9,7 @@ from __future__ import with_statement
 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 @@ def make_map(config):
     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 @@ def make_map(config):
     ##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 @@ def make_map(config):
 
 
     #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 @@ def make_map(config):
 
 
     #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 --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html
index 1f0d8e34..ce529b4b 100644
--- a/rhodecode/templates/base/base.html
+++ b/rhodecode/templates/base/base.html
@@ -70,9 +70,6 @@
            <p class="footer-link">
                 <a href="${h.url('bugtracker')}">${_('Submit a bug')}</a>
            </p>
-	       <p class="footer-link">
-	           <a href="${h.url('gpl_license')}">${_('GPL license')}</a>
-	       </p>
 	       <p class="footer-link-right">
 	           <a href="${h.url('rhodecode_official')}">RhodeCode</a> 
 	           ${c.rhodecode_version} &copy; 2010-${h.datetime.today().year} by Marcin Kuzminski
diff --git a/rhodecode/websetup.py b/rhodecode/websetup.py
index 9f2ffed2..d3872186 100644
--- a/rhodecode/websetup.py
+++ b/rhodecode/websetup.py
@@ -34,10 +34,12 @@ from rhodecode.lib.db_manage import DbManage
 
 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 --git a/setup.py b/setup.py
index a989d766..015ac134 100644
--- a/setup.py
+++ b/setup.py
@@ -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 @@ classifiers = ['Development Status :: 4 - Beta',
                '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 @@ setup(
     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',