Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

astropy/io/votable/tests/vo_test.py failure on MIPS #1010

Merged
merged 2 commits into from Apr 26, 2013
Merged

astropy/io/votable/tests/vo_test.py failure on MIPS #1010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe9941b
Fix handling of third-party warnings when doing a VOTable validation
mdboom Apr 25, 2013
3d31e28
Create default arrays using "np.empty then set" rather than "np.ones …
mdboom Apr 25, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions astropy/io/votable/converters.py
View file
Open in desktop
Expand Up @@ -481,9 +481,8 @@ def __init__(self, field, base, arraysize, config={}, pos=None):
self._memsize = np.dtype(self.format).itemsize
self._bigendian_format = '>' + self.format

self.default = (
np.ones(arraysize, dtype=self._base.format) *
self._base.default)
self.default = np.empty(arraysize, dtype=self._base.format)
self.default[...] = self._base.default

def parse(self, value, config={}, pos=None):
parts = self._splitter(value, config, pos)
Expand Down
3 changes: 3 additions & 0 deletions astropy/io/votable/exceptions.py
View file
Open in desktop
Expand Up @@ -156,6 +156,9 @@ def parse_vowarning(line):
result['is_exception'] = False
result['is_other'] = False
result['is_something'] = False
if not isinstance(line, unicode):
line = line.decode('utf-8')
result['message'] = line

return result

Expand Down
2 changes: 1 addition & 1 deletion astropy/io/votable/table.py
View file
Open in desktop
Expand Up @@ -251,7 +251,7 @@ def validate(source, output=sys.stdout, xmllint=False, filename=None):
w = exceptions.parse_vowarning(warning)

if not w['is_something']:
output.write(warning)
output.write(w['message'])
output.write(u'\n\n')
else:
line = xml_lines[w['nline'] - 1]
Expand Down