summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorYaakov M. Nemoy <loupgaroublond@gmail.com>2008-12-29 23:09:13 -0500
committerYaakov M. Nemoy <loupgaroublond@gmail.com>2008-12-29 23:09:13 -0500
commitc4a7700faa98d75207be6096b70b9d7198f0c00b (patch)
tree939d7070811f63dca718634c5e53e79e616cbb85 /base
parentc304da3ab83ece610fb75cd9b9bedca8f30eaa47 (diff)
downloadfedora-devshell-c4a7700faa98d75207be6096b70b9d7198f0c00b.tar.gz
fedora-devshell-c4a7700faa98d75207be6096b70b9d7198f0c00b.tar.xz
fedora-devshell-c4a7700faa98d75207be6096b70b9d7198f0c00b.zip
Cleane up some debug statements
Diffstat (limited to 'base')
-rw-r--r--base/base.py15
1 files changed, 1 insertions, 14 deletions
diff --git a/base/base.py b/base/base.py
index 06934f7..59601ce 100644
--- a/base/base.py
+++ b/base/base.py
@@ -46,9 +46,6 @@ def load_modules():
exec "from modules import %s as module" % module_name
for item in dir(module):
obj = getattr(module, item)
- if item[0] != '_' and isclass(obj):
- log.debug('%s is subclass of Module: %s' %\
- (obj, issubclass(obj, Module)))
if item[0] != '_' and isclass(obj) and issubclass(obj, Module) \
and obj is not Module:
modules[item.lower()] = obj
@@ -58,10 +55,8 @@ def load_modules():
def load_module(name, data=[]):
top = None
try:
- log.debug("Loading %s.__init__(%s)" % (name, data))
top = modules[name](*data)
except TypeError, e:
- log.debug('got type error')
log.error("%s: %s" % (name, e))
raise ModuleError('probably bad call to __init__' , e)
return top
@@ -133,17 +128,13 @@ def do_command(data, top=None):
params = []
while len(data):
if not top:
- log.debug('not top')
mod = data.popleft()
try:
module = modules[mod]
except KeyError, e:
log.error('%s is not a known module' % e.message)
return None, None, None
- log.debug('mod is %s' % mod)
while len(data):
- log.debug('params so far %s' % params)
- log.debug('inner loop %s' % data)
param = data.popleft()
if hasattr(module, param):
data.appendleft(param)
@@ -158,14 +149,10 @@ def do_command(data, top=None):
log.debug(e.reason)
break
else:
- log.debug('is top')
- log.debug('params so far %s' % params)
param = data.popleft()
if hasattr(top, param):
- log.debug("next property %s found in %s" % (param, top))
top = getattr(top, param)
else:
- log.debug("adding argument: %s" % param)
params += [param]
output = None
try:
@@ -221,4 +208,4 @@ def setup_logger(opts):
log.addHandler(sh)
__all__ = ['do_command', 'log', 'setup_options', 'load_module', 'shell',
- 'print_docstrings', 'modules', 'setup_logger', 'load_modules'] \ No newline at end of file
+ 'print_docstrings', 'modules', 'setup_logger', 'load_modules']