Revision: 2985
Author: janne.t.harkonen
Date: Thu Apr 15 00:44:41 2010
Log: Got rid of useless base class
http://code.google.com/p/robotframework/source/detail?r=2985
Modified:
/trunk/src/robot/common/__init__.py
/trunk/src/robot/common/handlers.py
/trunk/src/robot/parsing/userkeyword.py
/trunk/src/robot/running/handlers.py
/trunk/src/robot/running/userkeyword.py
=======================================
--- /trunk/src/robot/common/__init__.py Sun Apr 19 13:26:54 2009
+++ /trunk/src/robot/common/__init__.py Thu Apr 15 00:44:41 2010
@@ -15,6 +15,6 @@
from model import BaseTestSuite, BaseTestCase
from keyword import BaseKeyword
-from handlers import BaseHandler, UserErrorHandler
+from handlers import UserErrorHandler
from libraries import BaseLibrary
from statistics import Statistics
=======================================
--- /trunk/src/robot/common/handlers.py Wed Apr 14 10:55:35 2010
+++ /trunk/src/robot/common/handlers.py Thu Apr 15 00:44:41 2010
@@ -13,23 +13,6 @@
# limitations under the License.
from robot.errors import DataError
-from robot import utils
-
-
-class BaseHandler:
-
- def __getattr__(self, name):
- if name == 'longname':
- return '%s.%s' % (self.library.name, self.name)
- if name == 'shortdoc':
- return self.doc and self.doc.splitlines()[0] or ''
- raise AttributeError("%s does not have attribute '%s'"
- % (self.__class__.__name__, name))
-
- def _tracelog_args(self, logger, posargs, kwargs={}):
- args = [ utils.safe_repr(a) for a in posargs ] \
- + [ '%s=%s' % (utils.unic(a), utils.safe_repr(kwargs[a])) for
a in kwargs ]
- logger.trace('Arguments: [ %s ]' % ' | '.join(args))
class UserErrorHandler:
=======================================
--- /trunk/src/robot/parsing/userkeyword.py Thu Mar 4 04:20:17 2010
+++ /trunk/src/robot/parsing/userkeyword.py Thu Apr 15 00:44:41 2010
@@ -18,7 +18,7 @@
from robot import utils
from robot.errors import DataError
from robot.variables import is_list_var, is_scalar_var
-from robot.common import BaseHandler, UserErrorHandler
+from robot.common import UserErrorHandler
from metadata import UserKeywordMetadata
from keywords import KeywordList
@@ -54,8 +54,7 @@
data.report_invalid_syntax(msg)
-class UserHandler(BaseHandler):
-
+class UserHandler(object):
type = 'user'
def __init__(self, kwdata):
=======================================
--- /trunk/src/robot/running/handlers.py Wed Apr 14 06:14:58 2010
+++ /trunk/src/robot/running/handlers.py Thu Apr 15 00:44:41 2010
@@ -15,7 +15,6 @@
import sys
from robot import utils
-from robot.common import BaseHandler
from runkwregister import RUN_KW_REGISTER
from arguments import PythonKeywordArguments, JavaKeywordArguments, \
@@ -56,8 +55,10 @@
return Init(library, '__init__', method)
-class _BaseHandler(BaseHandler):
+class _BaseHandler(object):
type = 'library'
+ longname = property(lambda self: '%s.%s' % (self.library.name,
self.name))
+ shortdoc = property(lambda self: self.doc.splitlines()[0] if self.doc
else '')
def __init__(self, library, handler_name, handler_method):
self.library = library
@@ -96,6 +97,11 @@
def _process_args(self, args, variables):
return self.arguments.resolve(args, variables)
+ def _tracelog_args(self, logger, posargs, kwargs={}):
+ args = [ utils.safe_repr(a) for a in posargs ] \
+ + [ '%s=%s' % (utils.unic(a), utils.safe_repr(kwargs[a])) for
a in kwargs ]
+ logger.trace('Arguments: [ %s ]' % ' | '.join(args))
+
def _capture_output(self):
utils.capture_output()
=======================================
--- /trunk/src/robot/running/userkeyword.py Wed Apr 14 00:52:32 2010
+++ /trunk/src/robot/running/userkeyword.py Thu Apr 15 00:44:41 2010
@@ -15,8 +15,8 @@
import os
import re
-from robot.common import BaseHandler, BaseLibrary, UserErrorHandler
-from robot.errors import DataError, ExecutionFailed
+from robot.common import BaseLibrary, UserErrorHandler
+from robot.errors import DataError
from robot.variables import is_list_var, VariableSplitter
from robot import utils
@@ -99,10 +99,12 @@
"Found: %s" % (where, name, names))
-class UserHandler(BaseHandler):
+class UserHandler(object):
type = 'user'
longname = property(lambda self: not self._libname and self.name
or '%s.%s' % (self._libname, self.name))
+ shortdoc = property(lambda self: self.doc.splitlines()[0] if self.doc
else '')
+
def __init__(self, handlerdata, libname):
self.name = utils.printable_name(handlerdata.name)
--
To unsubscribe, reply using "remove me" as the subject.
