changeset 841:78b3d2d730f2 beta

fixed import problems
author Marcin Kuzminski <marcin@python-works.com>
date Sat, 11 Dec 2010 18:54:25 +0100
parents ee6f345736a6
children d388a941b022
files rhodecode/lib/db_manage.py rhodecode/websetup.py
diffstat 2 files changed, 36 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/lib/db_manage.py	Sat Dec 11 15:04:28 2010 +0100
+++ b/rhodecode/lib/db_manage.py	Sat Dec 11 18:54:25 2010 +0100
@@ -43,10 +43,6 @@
 
 from sqlalchemy.engine import create_engine
 
-from rhodecode.lib.dbmigrate.migrate.versioning import api
-from rhodecode.lib.dbmigrate.migrate.exceptions import \
-    DatabaseNotControlledError
-
 log = logging.getLogger(__name__)
 
 class DbManage(object):
@@ -111,6 +107,11 @@
         
         :param revision: revision to upgrade to
         """
+
+        from rhodecode.lib.dbmigrate.migrate.versioning import api
+        from rhodecode.lib.dbmigrate.migrate.exceptions import \
+            DatabaseNotControlledError
+
         upgrade = ask_ok('You are about to perform database upgrade, make '
                          'sure You backed up your database before. '
                          'Continue ? [y/n]')
--- a/rhodecode/websetup.py	Sat Dec 11 15:04:28 2010 +0100
+++ b/rhodecode/websetup.py	Sat Dec 11 18:54:25 2010 +0100
@@ -1,8 +1,36 @@
-"""Setup the rhodecode application"""
+# -*- coding: utf-8 -*-
+"""
+    rhodecode.websetup
+    ~~~~~~~~~~~~~~~~~~
+
+    Weboperations and setup for rhodecode
+    
+    :created_on: Dec 11, 2010
+    :author: marcink
+    :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>    
+    :license: GPLv3, see COPYING for more details.
+"""
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; version 2
+# of the License or (at your opinion) any later version of the license.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.
+
+import os
+import logging
+
 from rhodecode.config.environment import load_environment
 from rhodecode.lib.db_manage import DbManage
-import logging
-import os
+
 
 log = logging.getLogger(__name__)