Author: laukpe
Date: Tue Nov 25 14:33:32 2008
New Revision: 1119
Modified:
trunk/tools/libdoc/libdoc.py
Log:
More cleanup. Janne, can you see is something wrong with checking maxargs
instead of using isinstance? I tested it (even added new file) but might be
missing something.
Modified: trunk/tools/libdoc/libdoc.py
==============================================================================
--- trunk/tools/libdoc/libdoc.py (original)
+++ trunk/tools/libdoc/libdoc.py Tue Nov 25 14:33:32 2008
@@ -48,7 +48,6 @@
import re
from robot.running import TestLibrary, UserLibrary
-from robot.running.handlers import _NoInitHandler
from robot.serializing import Template, Namespace
from robot import utils
from robot.errors import DataError, Information
@@ -77,8 +76,8 @@
exit(msg=str(msg))
except DataError, err:
exit(error=str(err))
- output = opts['output'] is not None and opts['output'] or '.'
- format = opts['format'] is not None and opts['format'] or 'HTML'
+ output = opts['output'] or '.'
+ format = opts['format'] or 'HTML'
return os.path.abspath(output), format.upper(), args[0]
@@ -206,11 +205,9 @@
self.keywords.sort()
def _get_initializers(self, lib):
- if lib.init and not isinstance(lib.init, _NoInitHandler):
- init = KeywordDoc(lib.init, self)
- if init.args:
- return [init]
- return []
+ if not lib.init or lib.init.maxargs == 0:
+ return []
+ return [KeywordDoc(lib.init, self)]
def _import(self, name_or_path):
if os.path.exists(name_or_path):
