backup/pywb
1
0
Fork 0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-24 06:59:52 +01:00
Code Issues Projects Releases Activity

cdx: encoding: use to_native_str() consistently for better py2 compat

Browse Source
This commit is contained in:
Ilya Kreymer 2016-05-23 11:47:44 -07:00
parent 8ad66249c7
commit 8ef6eb97b8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pywb/cdx/cdxobject.py
View File

@ -153,7 +153,7 @@ class CDXObject(OrderedDict):
raise CDXException(msg) raise CDXException(msg)
for header, field in zip(cdxformat, fields): for header, field in zip(cdxformat, fields):
self[header] = field.decode('utf-8') self[header] = to_native_str(field, 'utf-8')
self.cdxline = cdxline self.cdxline = cdxline
@ -213,7 +213,7 @@ class CDXObject(OrderedDict):
def __str__(self): def __str__(self):
if self.cdxline: if self.cdxline:
return self.cdxline.decode('utf-8') return to_native_str(self.cdxline, 'utf-8')
if not self._from_json: if not self._from_json:
return ' '.join(str(val) for val in six.itervalues(self)) return ' '.join(str(val) for val in six.itervalues(self))
@ -263,7 +263,7 @@ class IDXObject(OrderedDict):
raise CDXException(msg.format(len(fields), self.NUM_REQ_FIELDS)) raise CDXException(msg.format(len(fields), self.NUM_REQ_FIELDS))
for header, field in zip(self.FORMAT, fields): for header, field in zip(self.FORMAT, fields):
self[header] = field.decode('utf-8') self[header] = to_native_str(field, 'utf-8')
self['offset'] = int(self['offset']) self['offset'] = int(self['offset'])
self['length'] = int(self['length']) self['length'] = int(self['length'])
@ -285,4 +285,4 @@ class IDXObject(OrderedDict):
return json_encode(self) + '\n' return json_encode(self) + '\n'
def __str__(self): def __str__(self):
return self.idxline.decode('utf-8') return to_native_str(self.idxline, 'utf-8')