tanner/wolframalpha
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move from_doc to the Document class

Browse Source
This commit is contained in:
Jason R. Coombs 2016-09-03 14:33:17 -04:00
parent 5d697ade21
commit 658183b56c
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
wolframalpha/__init__.py
View File

@ -71,6 +71,17 @@ class Document(dict):
_attr_types = {} _attr_types = {}
"Override the types from the document" "Override the types from the document"
@classmethod
def from_doc(cls, doc):
"""
Load instances from the xmltodict result. Always return
a list, even if the result is a singleton.
"""
if type(doc) != list:
doc = [doc]
return list(map(cls, doc))
def __getattr__(self, name): def __getattr__(self, name):
type = self._attr_types.get(name, lambda x: x) type = self._attr_types.get(name, lambda x: x)
attr_name = '@' + name attr_name = '@' + name
@ -155,16 +166,6 @@ class Image(Document):
width=int, width=int,
) )
@classmethod
def from_doc(cls, doc):
"""
Load images from the xmltodictresult. Always return
a list, even if the result is a singleton.
"""
if type(doc) != list:
doc = [doc]
return list(map(Image, doc))
class Subpod(Document): class Subpod(Document):
""" """
@ -174,16 +175,6 @@ class Subpod(Document):
img=Image.from_doc, img=Image.from_doc,
) )
@classmethod
def from_doc(cls, doc):
"""
Load subpods from the xmltodict result. Always return
a list, even if the result is a singleton.
"""
if type(doc) != list:
doc = [doc]
return list(map(cls, doc))
def xml_bool(str_val): def xml_bool(str_val):
return ( return (