Skip to content

Simbad.simbad returns bytes objects. #481

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

Merged
merged 2 commits into from
Mar 2, 2015
Merged

Simbad.simbad returns bytes objects. #481

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
7286ae9
SIMBAD: return strings in python3 instead of bytes
adamginsburg Mar 2, 2015
79b08cc
that silly little ALMA change broke all the tests.
adamginsburg Mar 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion astroquery/alma/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ def stage_data(self, uids):
payload = {'dataset':['ALMA+'+clean_uid(uid) for uid in uids]}
log.debug("First request payload: {0}".format(payload))

self._staging_log = {}
self._staging_log = {'first_post_url':url}

# Request staging for the UIDs
# This component cannot be cached, since the returned data can change
Expand Down
9 changes: 6 additions & 3 deletions astroquery/simbad/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,17 +892,20 @@ def nb_errors(self):
class SimbadVOTableResult(SimbadResult):
"""VOTable-type Simbad result"""
def __init__(self, txt, verbose=False, pedantic=False):
SimbadResult.__init__(self, txt, verbose=verbose)
self.__pedantic = pedantic
self.__table = None
if not self.verbose:
if not verbose:
commons.suppress_vo_warnings()
super(SimbadVOTableResult, self).__init__(txt, verbose=verbose)


@property
def table(self):
if self.__table is None:
self.__table = votable.parse_single_table(BytesIO(self.data.encode('utf8')), pedantic=False).to_table()
self.bytes = BytesIO(self.data.encode('utf8'))
tbl = votable.parse_single_table(self.bytes, pedantic=False)
self.__table = tbl.to_table()
self.__table.convert_bytestring_to_unicode()
return self.__table

bibcode_regex = re.compile(r'query\s+bibcode\s+(wildcard)?\s+([\w]*)')
Expand Down