Added better error handling and messages.

This commit is contained in:
Nanda Scott 2018-02-13 16:17:20 -05:00
parent e86d911cc4
commit 5cba1532f7
2 changed files with 59 additions and 59 deletions

View File

@ -34,304 +34,304 @@ class CardsObject(object):
def object(self):
if self.__checkForKey('object') is None:
return KeyError("This card has no associated object key.")
raise KeyError("This card has no key \'object\'")
return self.scryfallJson['object']
def id(self):
if self.__checkForKey('id') is None:
return KeyError("This card has no associated id key.")
raise KeyError("This card has no key \'id\'")
return self.scryfallJson['id']
def multiverse_ids(self):
if self.__checkForKey('multiverse_ids') is None:
return KeyError("This card has no associated multiverse id key.")
raise KeyError("This card has no key \'multiverse_ids\'")
return self.scryfallJson['multiverse_ids']
def mtgo_id(self):
if self.__checkForKey('mtgo_id') is None:
return KeyError("This card has no associated mtgo id key.")
raise KeyError("This card has no key \'mtgo_id\'")
return self.scryfallJson['mtgo_id']
def mtgo_foil_id(self):
if self.__checkForKey('mtgo_foil_id') is None:
return KeyError("This card has no associate mtgo foil id key.")
raise KeyError("This card has no key \'mtgo_foil_id\'")
return self.scryfallJson['mtgo_foil_id']
def name(self):
if self.__checkForKey('name') is None:
return KeyError("This card has no associated name key.")
raise KeyError("This card has no key \'name\'")
return self.scryfallJson['name']
def uri(self):
if self.__checkForKey('uri') is None:
return KeyError("This card has no associated uri key.")
raise KeyError("This card has no key \'uri\'")
return self.scryfallJson['uri']
def scryfall_uri(self):
if self.__checkForKey('scryfall_uri') is None:
return KeyError("This card has no associated scryfall uri key.")
raise KeyError("This card has no key \'scryfall_uri\'")
return self.scryfallJson['scryfall_uri']
def layout(self):
if self.__checkForKey('layout') is None:
return KeyError("This card has no associated layout key.")
raise KeyError("This card has no key \'layout\'")
return self.scryfallJson['layout']
def highres_image(self):
if self.__checkForKey('highres_image') is None:
return KeyError("This card has no associated highres image key.")
raise KeyError("This card has no key \'highres_image\'")
return self.scryfallJson['highres_image']
def image_uris(self):
if self.__checkForKey('image_uris') is None:
return KeyError("This card has no associated image uris key.")
raise KeyError("This card has no key \'image_uris\'")
return self.scryfallJson['image_uris']
def cmc(self):
if self.__checkForKey('cmc') is None:
return KeyError("This card has no associated cmc key.")
raise KeyError("This card has no key \'cmc\'")
return self.scryfallJson['cmc']
def type_line(self):
if self.__checkForKey('type_line') is None:
return KeyError("This card has no associated type line key.")
raise KeyError("This card has no key \'type_line\'")
return self.scryfallJson['type_line']
def oracle_text(self):
if self.__checkForKey('oracle_text') is None:
return KeyError("This card has no associated oracle text key.")
raise KeyError("This card has no key \'oracle_text\'")
return self.scryfallJson['oracle_text']
def mana_cost(self):
if self.__checkForKey('mana_cost') is None:
return KeyError("This card has no associated mana cost key.")
raise KeyError("This card has no key \'mana_cost\'")
return self.scryfallJson['mana_cost']
def colors(self):
if self.__checkForKey('colors') is None:
return KeyError("This card has no associated colors key.")
raise KeyError("This card has no key \'colors\'")
return self.scryfallJson['colors']
def color_identity(self):
if self.__checkForKey('color_identity') is None:
return KeyError("This card has no associated color identity key.")
raise KeyError("This card has no key \'color_identity\'")
return self.scryfallJson['color_identity']
def legalities(self):
if self.__checkForKey('legalities') is None:
return KeyError("This card has no associated legalities key.")
raise KeyError("This card has no key \'legalities\'")
return self.scryfallJson['legalities']
def reserved(self):
if self.__checkForKey('reserved') is None:
return KeyError("This card has no associated reserved key key.")
raise KeyError("This card has no key \'reserved\'")
return self.scryfallJson['reserved']
def reprint(self):
if self.__checkForKey('reprint') is None:
return KeyError("This card has no associated reprint key.")
raise KeyError("This card has no key \'reprint\'")
return self.scryfallJson['reprint']
def set_code(self):
if self.__checkForKey('set') is None:
return KeyError("This card has no associated set key.")
raise KeyError("This card has no key \'set_code\'")
return self.scryfallJson['set']
def set_name(self):
if self.__checkForKey('set_name') is None:
return KeyError("This card has no associated set name key.")
raise KeyError("This card has no key \'set_name\'")
return self.scryfallJson['set_name']
def set_uri(self):
if self.__checkForKey('set_uri') is None:
return KeyError("This card has no associated set uri key.")
raise KeyError("This card has no key \'set_uri\'")
return self.scryfallJson['set_uri']
def set_search_uri(self):
if self.__checkForKey('set_search_uri') is None:
return KeyError("This card has no associated set search uri key.")
raise KeyError("This card has no key \'set_search_uri\'")
return self.scryfallJson['set_search_uri']
def scryfall_set_uri(self):
if self.__checkForKey('scryfall_set_uri') is None:
return KeyError("This card has no associated scryfall set uri key.")
raise KeyError("This card has no key \'scryfall_set_uri\'")
return self.scryfallJson['scryfall_set_uri']
def rulings_uri(self):
if self.__checkForKey('rulings_uri') is None:
return KeyError("This card has no associated rulings uri key.")
raise KeyError("This card has no key \'rulings_uri\'")
return self.scryfallJson['rulings_uri']
def prints_search_uri(self):
if self.__checkForKey('prints_search_uri') is None:
return KeyError("This card has no associated prints search uri key.")
raise KeyError("This card has no key \'prints_search_uri\'")
return self.scryfallJson['prints_search_uri']
def collector_number(self):
if self.__checkForKey('collector_number') is None:
return KeyError("This card has no associated collector number key.")
raise KeyError("This card has no key \'collector_number\'")
return self.scryfallJson['collector_number']
def digital(self):
if self.__checkForKey('digital') is None:
return KeyError("This card has no associated digital key key.")
raise KeyError("This card has no key \'digital\'")
return self.scryfallJson['digital']
def rarity(self):
if self.__checkForKey('rarity') is None:
return KeyError("This card has no associated rarity key.")
raise KeyError("This card has no key \'rarity\'")
return self.scryfallJson['rarity']
def illustration_id(self):
if self.__checkForKey('illustration_id') is None:
return KeyError("This card has no associated illustration id key.")
raise KeyError("This card has no key \'illustration_id\'")
return self.scryfallJson['illustration_id']
def artist(self):
if self.__checkForKey('artist') is None:
return KeyError("This card has no associated artist key.")
raise KeyError("This card has no key \'artist\'")
return self.scryfallJson['artist']
def frame(self):
if self.__checkForKey('frame') is None:
return KeyError("This card has no associated frame key.")
raise KeyError("This card has no key \'frame\'")
return self.scryfallJson['frame']
def full_art(self):
if self.__checkForKey('') is None:
return KeyError("This card has no associated full art key key.")
raise KeyError("This card has no key \'full_art\'")
return self.scryfallJson['full_art']
def border_color(self):
if self.__checkForKey('border_color') is None:
return KeyError("This card has no associated border color key.")
raise KeyError("This card has no key \'border_color\'")
return self.scryfallJson['border_color']
def timeshifted(self):
if self.__checkForKey('timeshifted') is None:
return KeyError("This card has no associated timeshifted key key.")
raise KeyError("This card has no key \'timeshifted\'")
return self.scryfallJson['timeshifted']
def colorshifted(self):
if self.__checkForKey('colorshifted') is None:
return KeyError("This card has no associated colorshifted key key.")
raise KeyError("This card has no key \'colorshifted\'")
return self.scryfallJson['colorshifted']
def futureshifted(self):
if self.__checkForKey('futureshifted') is None:
return KeyError("This card has no associated futureshifted key key.")
raise KeyError("This card has no key \'futureshifted\'")
return self.scryfallJson['futureshifted']
def edhrec_rank(self):
if self.__checkForKey('edhrec_rank') is None:
return KeyError("This card has no associated edhrec rank key.")
raise KeyError("This card has no key \'edhrec_rank\'")
return self.scryfallJson['edhrec_rank']
def currency(self, mode):
modes = ['usd', 'eur', 'tix']
if mode not in modes:
return KeyError("{} is not a key.".format(mode))
raise KeyError("{} is not a key.".format(mode))
if self.__checkForKey(mode) is None:
return KeyError("This card has no associated currency {} key".format(mode))
raise KeyError("This card has no currency key {}".format(mode))
return self.scryfallJson[mode]
def related_uris(self):
if self.__checkForKey('related_uris') is None:
return KeyError("This card has no associated related uris key.")
raise KeyError("This card has no key \'related_uris\'")
return self.scryfallJson['related_uris']
def purchase_uris(self):
if self.__checkForKey('purchase_uris') is None:
return KeyError("This card has no associated purchase uris key.")
raise KeyError("This card has no key \'purchase_uris\'")
return self.scryfallJson['purchase_uris']
def life_modifier(self):
if self.__checkForKey('life_modifier') is None:
return KeyError("This card has no associated life modifier key.")
raise KeyError("This card has no key \'life_modifier\'")
return self.scryfallJson['life_modifier']
def hand_modifier(self):
if self.__checkForKey('hand_modifier') is None:
return KeyError("This card has no associated hand modifier key.")
raise KeyError("This card has no key \'hand_modifier\'")
return self.scryfallJson['hand_modifier']
def color_indicator(self):
if self.__checkForKey('color_indicator') is None:
return KeyError("This card has no associated color indicator key.")
raise KeyError("This card has no key \'color_indicator\'")
return self.scryfallJson['color_indicator']
def all_parts(self):
if self.__checkForKey('all_parts') is None:
return KeyError("This card has no associated all parts key.")
raise KeyError("This card has no key \'all_parts\'")
return self.scryfallJson['all_parts']
def card_faces(self):
if self.__checkForKey('card_faces') is None:
return KeyError("This card has no associated card faces key.")
raise KeyError("This card has no key \'card_faces\'")
return self.scryfallJson['card_faces']
def watermark(self):
if self.__checkForKey('watermark') is None:
return KeyError("This card has no associated watermark key.")
raise KeyError("This card has no key \'watermark\'")
return self.scryfallJson['watermark']
def story_spotlight_number(self):
if self.__checkForKey('story_spotlight_number') is None:
return KeyError("This card has no associated story spotlight number key.")
raise KeyError("This card has no key \'story_spotlight_number\'")
return self.scryfallJson['story_spotlight_number']
def story_spotlight_uri(self):
if self.__checkForKey('story_spotlight_uri') is None:
return KeyError("This card has no associated story spotlight uri key.")
raise KeyError("This card has no key \'story_spotlight_uri\'")
return self.scryfallJson['story_spotlight_uri']

View File

@ -40,48 +40,48 @@ class RulingsObject(object):
def object(self):
if self.__checkForKey('object') is None:
return KeyError('This ruling object has no associated object key.')
return KeyError('This ruling object has no key \'object\'')
return self.scryfallJson['object']
def has_more(self):
if self.__checkForKey('has_more') is None:
return KeyError('This ruling object has no associated has_more key.')
return KeyError('This ruling object has no key \'has_more\'')
return self.scryfallJson['has_more']
def data(self):
if self.__checkForKey('data') is None:
return KeyError('This ruling object has no associated data key.')
return KeyError('This ruling object has no key \'data\'')
return self.scryfallJson['data']
def data_length(self):
if self.__checkForKey('data') is None:
return KeyError('This ruling object has no associated data key.')
return KeyError('This ruling object has no key \'data\'')
return len(self.scryfallJson['data'])
def ruling_object(self, num):
if self.__checkForTupleKey('data', num, 'object') is None:
return KeyError('This ruling has no object key.')
return KeyError('This ruling has no key \'object\'')
return self.scryfallJson['data'][num]['object']
def ruling_source(self, num):
if self.__checkForTupleKey('data', num, 'source') is None:
return KeyError('This ruling has no source key.')
return KeyError('This ruling has no key \'source\'')
return self.scryfallJson['data'][num]['source']
def ruling_published_at(self, num):
if self.__checkForTupleKey('data', num, 'published_at') is None:
return KeyError('This ruling has no published_at key.')
return KeyError('This ruling has no key \'published_at\'')
return self.scryfallJson['data'][num]['published_at']
def ruling_comment(self, num):
if self.__checkForTupleKey('data', num, 'comment') is None:
return KeyError('This ruling has no comment key.')
return KeyError('This ruling has no key \'comment\'')
return self.scryfallJson['data'][num]['comment']