2 new revisions:
Revision: d419404b92fd
Author: Janne Härkönen <j...@reaktor.fi>
Date: Wed May 4 04:10:08 2011
Log: Removed deprecated_absolute argument from List Dir* -keywords....
http://code.google.com/p/robotframework/source/detail?r=d419404b92fd
Revision: 83a7ac83f5ad
Author: Janne Härkönen <j...@reaktor.fi>
Date: Wed May 4 04:11:18 2011
Log: Automated merge with https://robotframework.googlecode.com/hg
http://code.google.com/p/robotframework/source/detail?r=83a7ac83f5ad
==============================================================================
Revision: d419404b92fd
Author: Janne Härkönen <j...@reaktor.fi>
Date: Wed May 4 04:10:08 2011
Log: Removed deprecated_absolute argument from List Dir* -keywords.
Update issue 506
Status: Done
http://code.google.com/p/robotframework/source/detail?r=d419404b92fd
Modified:
/atest/robot/standard_libraries/operating_system/list_dir.txt
/atest/testdata/standard_libraries/deprecated_os/misc.txt
/atest/testdata/standard_libraries/operating_system/list_dir.txt
/src/robot/libraries/OperatingSystem.py
=======================================
--- /atest/robot/standard_libraries/operating_system/list_dir.txt Sun Sep
26 12:21:12 2010
+++ /atest/robot/standard_libraries/operating_system/list_dir.txt Wed May
4 04:10:08 2011
@@ -15,7 +15,7 @@
List And Count Directory
${tc} = Check Test Case ${TESTNAME}
Verify List And Count Messages ${tc.kws[0]} 3 items
\n${F1}\n${DIR}\n${F2}
- Verify List And Count Messages ${tc.kws[-1]} 0 items
+ Verify List And Count Messages ${tc.kws[-1]} 0 items
List And Count Files In Directory
${tc} = Check Test Case ${TESTNAME}
@@ -49,7 +49,6 @@
Verify List Message ${tc.kws[0]} 2 items
\n${BASE}${/}${F1}\n${BASE}${/}${F2}
Verify List Message ${tc.kws[2]} 2 files
\n${BASE}${/}${F1}\n${BASE}${/}${F2}
Verify List Message ${tc.kws[4]} 1 directory \n${BASE}${/}${DIR}
- Check Log Message ${tc.kws[4].msgs[1]} Signature of 'List Directory'
keywords has changed. Please update how 'absolute' argumemt is given. WARN
*** Keywords ***
=======================================
--- /atest/testdata/standard_libraries/deprecated_os/misc.txt Tue Mar 23
10:54:32 2010
+++ /atest/testdata/standard_libraries/deprecated_os/misc.txt Wed May 4
04:10:08 2011
@@ -48,15 +48,14 @@
Create File ${TESTDIR}${/}foo.txt
Create File ${TESTDIR}${/}bar.txt
Create Dir ${TESTDIR}${/}foodir
- ${names} = List Dir ${TESTDIR} ${EMPTY} ${EMPTY} absolute
- Log ${names}
+ ${names} = List Dir ${TESTDIR} ${EMPTY} yes
Equals ${names[0]} ${TESTDIR}${/}bar.txt
Equals ${names[1]} ${TESTDIR}${/}foo.txt
Equals ${names[2]} ${TESTDIR}${/}foodir
- ${names} = List Files In Dir ${TESTDIR} ${EMPTY} ${EMPTY} absolute
+ ${names} = List Files In Dir ${TESTDIR} ${EMPTY} absolute
Equals ${names[0]} ${TESTDIR}${/}bar.txt
Equals ${names[1]} ${TESTDIR}${/}foo.txt
- ${names} = List Dirs In Dir ${TESTDIR} ${EMPTY} ${EMPTY} absolute
+ ${names} = List Dirs In Dir ${TESTDIR} ${EMPTY} absolute
Equals ${names[0]} ${TESTDIR}${/}foodir
List And Count Files And Dirs In Dir
=======================================
--- /atest/testdata/standard_libraries/operating_system/list_dir.txt Sun
Sep 26 12:21:12 2010
+++ /atest/testdata/standard_libraries/operating_system/list_dir.txt Wed
May 4 04:10:08 2011
@@ -48,7 +48,7 @@
Listing Should Have Correct Items ${items} ${BASE}${/}${F1}
${BASE}${/}${F2}
@{items} = List Files In Directory ${BASE} absolute=yes
Listing Should Have Correct Items ${items} ${BASE}${/}${F1}
${BASE}${/}${F2}
- @{items} = List Directories In Directory ${BASE} ${EMPTY}
${EMPTY} deprecated absolute
+ @{items} = List Directories In Directory ${BASE} ${EMPTY} yes
Listing Should Have Correct Items ${items} ${BASE}${/}${DIR}
=======================================
--- /src/robot/libraries/OperatingSystem.py Fri Apr 15 14:27:57 2011
+++ /src/robot/libraries/OperatingSystem.py Wed May 4 04:10:08 2011
@@ -1072,8 +1072,7 @@
self._link("Size of file '%%s' is %d byte%s" % (size, plural),
path)
return size
- def list_directory(self, path, pattern=None, absolute=False,
- deprecated_absolute=None):
+ def list_directory(self, path, pattern=None, absolute=False):
"""Returns and logs items in a directory, optionally filtered with
`pattern`.
File and directory names are returned in case-sensitive
alphabetical
@@ -1088,34 +1087,26 @@
If `pattern` is given, only items matching it are returned. The
pattern
matching syntax is explained in `introduction`, and in this case
- matching is case-sensitive. Support for different pattern types
- was removed in Robot Framework 2.5.
+ matching is case-sensitive.
Examples (using also other `List Directory` variants):
| @{items} = | List Directory | ${TEMPDIR} |
| @{files} = | List Files In Directory | /tmp | *.txt | absolute |
| ${count} = | Count Files In Directory | ${CURDIR} | ??? |
-
- The signature of this keyword was changed in RF 2.5 when the
deprecated
- `pattern_type` argument was removed. The `deprecated_absolute`
argument
- was added to keep the signature backwards compatible, but it will
be
- removed in RF 2.6.
"""
- items = self._list_dir(path, pattern, absolute,
deprecated_absolute)
+ items = self._list_dir(path, pattern, absolute)
self._info('%d item%s:\n%s' % (len(items),
plural_or_not(items), '\n'.join(items)))
return items
- def list_files_in_directory(self, path, pattern=None, absolute=False,
- deprecated_absolute=None):
+ def list_files_in_directory(self, path, pattern=None, absolute=False):
"""A wrapper for `List Directory` that returns only files."""
- files = self._list_files_in_dir(path, pattern, absolute,
deprecated_absolute)
+ files = self._list_files_in_dir(path, pattern, absolute)
self._info('%d file%s:\n%s' % (len(files),
plural_or_not(files), '\n'.join(files)))
return files
- def list_directories_in_directory(self, path, pattern=None,
absolute=False,
- deprecated_absolute=None):
+ def list_directories_in_directory(self, path, pattern=None,
absolute=False):
"""A wrapper for `List Directory` that returns only directories."""
- dirs = self._list_dirs_in_dir(path, pattern, absolute,
deprecated_absolute)
+ dirs = self._list_dirs_in_dir(path, pattern, absolute)
self._info('%d director%s:\n%s' % (len(dirs), 'y' if len(dirs) ==
1 else 'ies', '\n'.join(dirs)))
return dirs
@@ -1142,8 +1133,7 @@
self._info("%s director%s." % (count, 'y' if count == 1
else 'ies'))
return count
- def _list_dir(self, path, pattern=None, absolute=False,
- deprecated_absolute=None):
+ def _list_dir(self, path, pattern=None, absolute=False):
path = self._absnorm(path)
self._link("Listing contents of directory '%s'.", path)
if not os.path.isdir(path):
@@ -1151,27 +1141,19 @@
# result is already unicode but unic also handles NFC normalization
items = sorted(unic(item) for item in os.listdir(path))
if pattern:
- items = [ i for i in items if fnmatch.fnmatchcase(i, pattern) ]
- if deprecated_absolute is not None:
- self._warn("Signature of 'List Directory' keywords has
changed. "
- "Please update how 'absolute' argumemt is given.")
- absolute = deprecated_absolute
+ items = [i for i in items if fnmatch.fnmatchcase(i, pattern)]
if absolute:
path = os.path.normpath(path)
- items = [ os.path.join(path,item) for item in items ]
+ items = [os.path.join(path,item) for item in items]
return items
- def _list_files_in_dir(self, path, pattern=None, absolute=False,
- deprecated_absolute=None):
- return [ item for item in
- self._list_dir(path, pattern, absolute,
deprecated_absolute)
- if os.path.isfile(os.path.join(path, item)) ]
-
- def _list_dirs_in_dir(self, path, pattern=None, absolute=False,
- deprecated_absolute=None):
- return [ item for item in
- self._list_dir(path, pattern, absolute,
deprecated_absolute)
- if os.path.isdir(os.path.join(path, item)) ]
+ def _list_files_in_dir(self, path, pattern=None, absolute=False):
+ return [item for item in self._list_dir(path, pattern, absolute)
+ if os.path.isfile(os.path.join(path, item))]
+
+ def _list_dirs_in_dir(self, path, pattern=None, absolute=False):
+ return [item for item in self._list_dir(path, pattern, absolute)
+ if os.path.isdir(os.path.join(path, item))]
def touch(self, path):
"""Emulates the UNIX touch command.
==============================================================================
Revision: 83a7ac83f5ad
Author: Janne Härkönen <j...@reaktor.fi>
Date: Wed May 4 04:11:18 2011
Log: Automated merge with https://robotframework.googlecode.com/hg
http://code.google.com/p/robotframework/source/detail?r=83a7ac83f5ad
