2 new revisions:
Revision: 7eb73a2c70ad
Branch: default
Author: Pekka Klärck
Date: Tue Nov 19 13:40:14 2013 UTC
Log: doc fix
http://code.google.com/p/robotframework/source/detail?r=7eb73a2c70ad
Revision: 945e43977158
Branch: default
Author: Pekka Klärck
Date: Tue Nov 19 15:16:52 2013 UTC
Log: UG: Documented that --VariableFile nowadays searches PYTHONPATH...
http://code.google.com/p/robotframework/source/detail?r=945e43977158
==============================================================================
Revision: 7eb73a2c70ad
Branch: default
Author: Pekka Klärck
Date: Tue Nov 19 13:40:14 2013 UTC
Log: doc fix
http://code.google.com/p/robotframework/source/detail?r=7eb73a2c70ad
Modified:
/src/robot/utils/importer.py
=======================================
--- /src/robot/utils/importer.py Thu Jun 6 14:00:44 2013 UTC
+++ /src/robot/utils/importer.py Tue Nov 19 13:40:14 2013 UTC
@@ -72,12 +72,9 @@
"""Import a Python module or Java class using a file system path.
When importing a Python file, the path must end with '.py' and the
- actual file must also exist. When importing a Python module
implemented
- as a directory, the path must end with '/' or, on Windows,
with '\\'.
-
- When importing Java classes, the path must end with '.java'
or '.class'.
- The class file must exist in both cases and in the former case also
- the source file must exist.
+ actual file must also exist. When importing Java classes, the path
+ must end with '.java' or '.class'. The class file must exist in
both
+ cases and in the former case also the source file must exist.
If `instantiate_with_args` is not None, imported classes are
instantiated with the specified arguments automatically.
==============================================================================
Revision: 945e43977158
Branch: default
Author: Pekka Klärck
Date: Tue Nov 19 15:16:52 2013 UTC
Log: UG: Documented that --VariableFile nowadays searches PYTHONPATH
Update issue 1401
Status: Done
Documented in UG. Don't think this needs to be documented in --help.
Tests passed. This can be considered done.
http://code.google.com/p/robotframework/source/detail?r=945e43977158
Modified:
/doc/userguide/src/CreatingTestData/ResourceAndVariableFiles.rst
=======================================
--- /doc/userguide/src/CreatingTestData/ResourceAndVariableFiles.rst Fri
May 10 11:34:26 2013 UTC
+++ /doc/userguide/src/CreatingTestData/ResourceAndVariableFiles.rst Tue
Nov 19 15:16:52 2013 UTC
@@ -30,7 +30,7 @@
If the path is given in an absolute format, it is used directly. In other
cases, the resource file is first searched relatively to the directory
where the importing file is located. If the file is not found there,
-it is then searched from the directories in PYTHONPATH. The path can
+it is then searched from the directories in :code:`PYTHONPATH`. The path
can
contain variables, and it is recommended to use them to make paths
system-independent (for example, :path:`${RESOURCES}/login_resources.html`
or
:path:`${RESOURCE_PATH}`). Additionally, slashes ("/") in the path
@@ -172,7 +172,7 @@
setting. Similarly to resource files, the path to the imported
variable file is considered relative to the directory where the
importing file is, and if not found, it is searched from the
-directories in PYTHONPATH. The path can also contain variables, and
+directories in :code:`PYTHONPATH`. The path can also contain variables, and
slashes are converted to backslashes on Windows. If an `argument file takes
arguments`__, they are specified in the cells after the path and also they
can contain variables.
@@ -210,7 +210,11 @@
--variablefile /absolute/path/common.py
--variablefile taking_arguments.py:arg1:arg2
-Variables in these files are globally available in all test data
+Starting from Robot Framework 2.8.2, variable files taken into use from the
+command line are also searched from the :code:`PYTHONPATH` similarly as
+variable files imported in the Setting table.
+
+Variables in these variable files are globally available in all test data
files, similarly as `individual variables`__ set with the
:opt:`--variable` option. If both :opt:`--variablefile` and
:opt:`--variable` options are used and there are variables with same
--
---
You received this message because you are subscribed to the Google Groups "robotframework-commit" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
