projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11789: Added tests.
[arvados.git]
/
sdk
/
python
/
arvados
/
util.py
diff --git
a/sdk/python/arvados/util.py
b/sdk/python/arvados/util.py
index e2692b738aa16a945d2d3935d39bae3030f5c687..3f50553c4b0251092d5758a33bc3c6ff19bf93ed 100644
(file)
--- a/
sdk/python/arvados/util.py
+++ b/
sdk/python/arvados/util.py
@@
-124,7
+124,7
@@
def tarball_extract(tarball, path):
raise arvados.errors.CommandFailedError(
"tar exited %d" % p.returncode)
os.symlink(tarball, os.path.join(path, '.locator'))
raise arvados.errors.CommandFailedError(
"tar exited %d" % p.returncode)
os.symlink(tarball, os.path.join(path, '.locator'))
- tld_extracts =
filter(lambda f: f != '.locator', os.listdir(path))
+ tld_extracts =
[f for f in os.listdir(path) if f != '.locator']
lockfile.close()
if len(tld_extracts) == 1:
return os.path.join(path, tld_extracts[0])
lockfile.close()
if len(tld_extracts) == 1:
return os.path.join(path, tld_extracts[0])
@@
-190,7
+190,7
@@
def zipball_extract(zipball, path):
"unzip exited %d" % p.returncode)
os.unlink(zip_filename)
os.symlink(zipball, os.path.join(path, '.locator'))
"unzip exited %d" % p.returncode)
os.unlink(zip_filename)
os.symlink(zipball, os.path.join(path, '.locator'))
- tld_extracts =
filter(lambda f: f != '.locator', os.listdir(path))
+ tld_extracts =
[f for f in os.listdir(path) if f != '.locator']
lockfile.close()
if len(tld_extracts) == 1:
return os.path.join(path, tld_extracts[0])
lockfile.close()
if len(tld_extracts) == 1:
return os.path.join(path, tld_extracts[0])
@@
-364,10
+364,10
@@
def is_hex(s, *length_args):
def list_all(fn, num_retries=0, **kwargs):
# Default limit to (effectively) api server's MAX_LIMIT
def list_all(fn, num_retries=0, **kwargs):
# Default limit to (effectively) api server's MAX_LIMIT
- kwargs.setdefault('limit', sys.max
int
)
+ kwargs.setdefault('limit', sys.max
size
)
items = []
offset = 0
items = []
offset = 0
- items_available = sys.max
int
+ items_available = sys.max
size
while len(items) < items_available:
c = fn(offset=offset, **kwargs).execute(num_retries=num_retries)
items += c['items']
while len(items) < items_available:
c = fn(offset=offset, **kwargs).execute(num_retries=num_retries)
items += c['items']