Removed uneeded utf8_text, after trunk fix.

This commit is contained in:
Oliver Graf 2012-07-29 08:26:29 +02:00
parent c10c8d03ad
commit 45deedd546

View File

@ -302,7 +302,7 @@ def encode_tbs(val, extra, flag_size=4):
ans += encint(extra[0b0001]) ans += encint(extra[0b0001])
return ans return ans
def utf8_text(text, empty=False): def utf8_text(text):
''' '''
Convert a possibly null string to utf-8 bytes, guaranteeing to return a non Convert a possibly null string to utf-8 bytes, guaranteeing to return a non
empty, normalized bytestring. empty, normalized bytestring.
@ -313,10 +313,7 @@ def utf8_text(text, empty=False):
text = text.decode('utf-8', 'replace') text = text.decode('utf-8', 'replace')
text = normalize(text).encode('utf-8') text = normalize(text).encode('utf-8')
else: else:
if not empty:
text = _('Unknown').encode('utf-8') text = _('Unknown').encode('utf-8')
else:
text = u''.encode('utf-8') # yeah, stupid
return text return text
def align_block(raw, multiple=4, pad=b'\0'): def align_block(raw, multiple=4, pad=b'\0'):