Skip to content

Commit

Permalink
Merge conflict.
Browse files Browse the repository at this point in the history
  • Loading branch information
hover2pi committed Apr 19, 2016
2 parents 53cccd5 + 3c3767d commit 7cdea1f
Showing 1 changed file with 15 additions and 1 deletion.
16 changes: 15 additions & 1 deletion astrodbkit/astrodb.py
Original file line number Diff line number Diff line change
Expand Up @@ -1522,7 +1522,21 @@ def pprint(data, names='', title='', formats={}):

# print it!
if title: print('\n' + title)
ii.write(pdata, sys.stdout, Writer=ii.FixedWidthTwoLine, formats=formats, fill_values=[('None', '-')])
try:
ii.write(pdata, sys.stdout, Writer=ii.FixedWidthTwoLine, formats=formats, fill_values=[('None', '-')])
except UnicodeDecodeError: # Fix for Unicode characters. Print out in close approximation to ii.write()
max_length = 50
str_lengths = dict()
for key in pdata.keys():
lengths = map(lambda x: len(str(x).decode('utf-8')), pdata[key].data)
lengths.append(len(key))
str_lengths[key] = min(max(lengths), max_length)
print(' '.join(key.rjust(str_lengths[key]) for key in pdata.keys()))
print(' '.join('-' * str_lengths[key] for key in pdata.keys()))
for i in range(len(pdata)):
print(' '.join(str(pdata[key].data[0]).decode('utf-8')[:max_length].rjust(str_lengths[key])
if pdata[key].data[0] is not None else '-'.rjust(str_lengths[key])
for key in pdata.keys()))


def clean_header(header):
Expand Down

0 comments on commit 7cdea1f

Please sign in to comment.