projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '17246-salt-install-improvements'
[arvados.git]
/
sdk
/
python
/
arvados
/
_normalize_stream.py
diff --git
a/sdk/python/arvados/_normalize_stream.py
b/sdk/python/arvados/_normalize_stream.py
index 9caef764edd5af6b6f1c39149ee5f7bf64433fd7..485c757e7fce34dda579185608f39bfe4911bd94 100644
(file)
--- a/
sdk/python/arvados/_normalize_stream.py
+++ b/
sdk/python/arvados/_normalize_stream.py
@@
-8,7
+8,9
@@
from . import config
import re
def escape(path):
import re
def escape(path):
- return re.sub('\\\\([0-3][0-7][0-7])', lambda m: '\\134'+m.group(1), path).replace(' ', '\\040')
+ path = re.sub('\\\\', lambda m: '\\134', path)
+ path = re.sub('[:\000-\040]', lambda m: "\\%03o" % ord(m.group(0)), path)
+ return path
def normalize_stream(stream_name, stream):
"""Take manifest stream and return a list of tokens in normalized format.
def normalize_stream(stream_name, stream):
"""Take manifest stream and return a list of tokens in normalized format.
@@
-53,13
+55,13
@@
def normalize_stream(stream_name, stream):
if streamoffset == current_span[1]:
current_span[1] += segment.segment_size
else:
if streamoffset == current_span[1]:
current_span[1] += segment.segment_size
else:
- stream_tokens.append("{0}:{1}:{2}".format(current_span[0], current_span[1] - current_span[0], fout))
+ stream_tokens.append(
u
"{0}:{1}:{2}".format(current_span[0], current_span[1] - current_span[0], fout))
current_span = [streamoffset, streamoffset + segment.segment_size]
if current_span is not None:
current_span = [streamoffset, streamoffset + segment.segment_size]
if current_span is not None:
- stream_tokens.append("{0}:{1}:{2}".format(current_span[0], current_span[1] - current_span[0], fout))
+ stream_tokens.append(
u
"{0}:{1}:{2}".format(current_span[0], current_span[1] - current_span[0], fout))
if not stream[streamfile]:
if not stream[streamfile]:
- stream_tokens.append("0:0:{0}".format(fout))
+ stream_tokens.append(
u
"0:0:{0}".format(fout))
return stream_tokens
return stream_tokens