projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2800: Merge branch 'master' into 2800-pgs
[arvados.git]
/
sdk
/
python
/
arvados
/
collection.py
diff --git
a/sdk/python/arvados/collection.py
b/sdk/python/arvados/collection.py
index 0c8b62080fd7056646fd555c1edb43dbd27d37a5..6cf4d07552183faffb74b13821289e2eae8feb42 100644
(file)
--- a/
sdk/python/arvados/collection.py
+++ b/
sdk/python/arvados/collection.py
@@
-93,10
+93,10
@@
def normalize(collection):
class CollectionReader(object):
def __init__(self, manifest_locator_or_text):
class CollectionReader(object):
def __init__(self, manifest_locator_or_text):
- if re.
search(r'^
[a-f0-9]{32}(\+\d+)?(\+\S+)*$', manifest_locator_or_text):
+ if re.
match(r'
[a-f0-9]{32}(\+\d+)?(\+\S+)*$', manifest_locator_or_text):
self._manifest_locator = manifest_locator_or_text
self._manifest_text = None
self._manifest_locator = manifest_locator_or_text
self._manifest_text = None
- elif re.
search(r'^\S+( [a-f0-9]{32,}(\+\S+)*)*
( \d+:\d+:\S+)+\n', manifest_locator_or_text):
+ elif re.
match(r'(\S+)( [a-f0-9]{32}(\+\d+)(\+\S+)*)+
( \d+:\d+:\S+)+\n', manifest_locator_or_text):
self._manifest_text = manifest_locator_or_text
self._manifest_locator = None
else:
self._manifest_text = manifest_locator_or_text
self._manifest_locator = None
else: