Author: janne.t.harkonen
Date: Tue Nov 25 04:10:23 2008
New Revision: 1101
Modified:
trunk/src/robot/common/handlers.py
trunk/src/robot/running/handlers.py
trunk/src/robot/running/testlibraries.py
trunk/src/robot/running/userkeyword.py
Log:
renamed method
Modified: trunk/src/robot/common/handlers.py
==============================================================================
--- trunk/src/robot/common/handlers.py (original)
+++ trunk/src/robot/common/handlers.py Tue Nov 25 04:10:23 2008
@@ -27,7 +27,7 @@
raise AttributeError("%s does not have attribute '%s'"
% (self.__class__.__name__, name))
- def _check_arg_limits(self, args):
+ def check_arg_limits(self, args):
if not self.minargs <= len(args) <= self.maxargs:
self._raise_inv_args(args)
return args
Modified: trunk/src/robot/running/handlers.py
==============================================================================
--- trunk/src/robot/running/handlers.py (original)
+++ trunk/src/robot/running/handlers.py Tue Nov 25 04:10:23 2008
@@ -82,7 +82,7 @@
if index < 0:
return self._replace_vars_from_args(args, variables)
if index == 0:
- return self._check_arg_limits(args)
+ return self.check_arg_limits(args)
# There might be @{list} variables and those might have more or
less
# arguments that is needed. Therefore we need to go through
arguments
# one by one.
@@ -92,12 +92,12 @@
# In case @{list} variable is unpacked, the arguments going further
# needs to be escaped, otherwise those are unescaped twice.
processed[index:] = [utils.escape(arg) for arg in
processed[index:]]
- return self._check_arg_limits(processed + args)
+ return self.check_arg_limits(processed + args)
def _replace_vars_from_args(self, args, variables):
"""Overridden by JavaHandler"""
args = variables.replace_list(args)
- return self._check_arg_limits(args)
+ return self.check_arg_limits(args)
def _run_handler(self, handler, args, output, namespace):
timeout = self._get_timeout(namespace)
Modified: trunk/src/robot/running/testlibraries.py
==============================================================================
--- trunk/src/robot/running/testlibraries.py (original)
+++ trunk/src/robot/running/testlibraries.py Tue Nov 25 04:10:23 2008
@@ -143,7 +143,7 @@
return self._libinst
def _get_instance(self):
- self.init._check_arg_limits(self.args)
+ self.init.check_arg_limits(self.args)
try:
return self._libcode(*self.args)
except:
@@ -223,7 +223,7 @@
return 'GLOBAL'
def get_instance(self):
- self.init._check_arg_limits(self.args)
+ self.init.check_arg_limits(self.args)
return self._libcode
def _create_handler(self, handler_name, handler_method):
Modified: trunk/src/robot/running/userkeyword.py
==============================================================================
--- trunk/src/robot/running/userkeyword.py (original)
+++ trunk/src/robot/running/userkeyword.py Tue Nov 25 04:10:23 2008
@@ -87,7 +87,7 @@
namespace.start_user_keyword(self)
args = namespace.variables.replace_list(args)
self._tracelog_args(output, args)
- self._check_arg_limits(args)
+ self.check_arg_limits(args)
if len(args) < len(self.args):
args += self._get_defaults(args, namespace.variables)
for name, value in zip(self.args, args):
