commit dc0df94453a05dd5d34749949cb7a85cf634a9c6
Author: Chris Feist <cfeist(a)redhat.com>
Date: Thu Dec 3 13:55:06 2009 -0600
Removed all references to scheme
luci/controllers/decorators.py | 4 ++--
luci/controllers/root.py | 4 +---
luci/lib/app_globals.py | 2 --
.../validate_create_cluster_form.py | 1 -
4 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/luci/controllers/decorators.py b/luci/controllers/decorators.py
index e54d9c3..76ef1c6 100644
--- a/luci/controllers/decorators.py
+++ b/luci/controllers/decorators.py
@@ -14,8 +14,8 @@ __all__ = ['mountSubControllers',
# Imports into module's namespace.
-APP_PREFIX = app_globals.scheme.APP_PREFIX
-base2CmdCtrl = app_globals.scheme.base2CmdCtrl
+APP_PREFIX = '/'
+base2CmdCtrl = '/'
def mountSubControllers(ctrls_dict=None, **ctrls_kwargs):
diff --git a/luci/controllers/root.py b/luci/controllers/root.py
index b4afec3..7bda783 100644
--- a/luci/controllers/root.py
+++ b/luci/controllers/root.py
@@ -28,10 +28,8 @@ __all__ = ['RootController']
# Imports into module's namespace.
-scheme = app_globals.scheme
-#(a)mountSubControllers(scheme.mounts())
class RootController(BaseController):
"""
The root controller for the luci application.
@@ -87,7 +85,7 @@ class RootController(BaseController):
elif homebasepage == 'managesystems':
tmpl_context.form = create_manage_systems_form
- app_url = scheme.APP_PREFIX + u'/'
+ app_url = u'/'
return dict(page='homebase',homebasepage=homebasepage,args=args,
base_url=app_url + 'cluster')
diff --git a/luci/lib/app_globals.py b/luci/lib/app_globals.py
index 0975673..b464e11 100644
--- a/luci/lib/app_globals.py
+++ b/luci/lib/app_globals.py
@@ -3,7 +3,6 @@
"""The application's Globals object"""
from luci.lib.form_utils import FormUtils
-from luci.controllers.scheme import LuciScheme
from luci.lib.demo_data import ClusterData
__all__ = ['Globals']
@@ -20,5 +19,4 @@ class Globals(object):
def __init__(self):
"""Prepare some common static functions, constants
etc."""
self.form_utils = FormUtils
- self.scheme = LuciScheme
self.data = ClusterData()
diff --git a/luci/widget_validators/validate_create_cluster_form.py
b/luci/widget_validators/validate_create_cluster_form.py
index 7142861..c977279 100644
--- a/luci/widget_validators/validate_create_cluster_form.py
+++ b/luci/widget_validators/validate_create_cluster_form.py
@@ -18,7 +18,6 @@ import luci.lib.ricci_queries as rq
from luci.widgets.create_cluster_form import create_cluster_form
# Imports into module's namespace.
-scheme = app_globals.scheme
data = app_globals.data
def validate_create_cluster_form(self, **kw):
Show replies by date