From 344fb532628bf65e5e91506f4c2bb88845b427f8 Mon Sep 17 00:00:00 2001 From: Nanda Scott Date: Tue, 23 Jan 2018 12:41:56 -0500 Subject: [PATCH] Removed some naming conflicts and made imports work properly. --- __init__.py | 7 +++++++ cards/__init__.py | 7 +++++++ cards/{id.py => cardid.py} | 0 cards/named.py | 6 +++--- 4 files changed, 17 insertions(+), 3 deletions(-) rename cards/{id.py => cardid.py} (100%) diff --git a/__init__.py b/__init__.py index e69de29..2855c22 100644 --- a/__init__.py +++ b/__init__.py @@ -0,0 +1,7 @@ +from scrython.cards import Autocomplete +from scrython.cards import Collector +from scrython.cards import Id +from scrython.cards import Mtgo +from scrython.cards import Multiverse +from scrython.cards import Named +from scrython.cards import RandomCard diff --git a/cards/__init__.py b/cards/__init__.py index e69de29..08911e0 100644 --- a/cards/__init__.py +++ b/cards/__init__.py @@ -0,0 +1,7 @@ +from .autocomplete import Autocomplete +from .collector import Collector +from .cardid import Id +from .mtgo import Mtgo +from .multiverse import Multiverse +from .named import Named +from .randomcard import RandomCard diff --git a/cards/id.py b/cards/cardid.py similarity index 100% rename from cards/id.py rename to cards/cardid.py diff --git a/cards/named.py b/cards/named.py index 5d088b6..542945e 100644 --- a/cards/named.py +++ b/cards/named.py @@ -14,7 +14,7 @@ class Named(object): Will return a 404 if this card has no back face. version: str The image version to return when using the image format: small, normal, large, png, art_crop, or border_crop. Defaults to large. - pretty: bool If true, the returned JSON will be prettified. Avoid using for production code. + pretty: bool If true, the returned JSON will be prettified. Avoid using for production code. Attributes: object: str Returns the type of object it is. (card, error, etc) @@ -27,13 +27,13 @@ class Named(object): scryfall_uri: str The full Scryfall page of the card. layout: str The image layout of the card. (normal, transform, etc) highres_image: bool Returns True if the card has a high res image. - card.image_uris: dict All image uris of the card in various qualities. + card_image_uris: dict All image uris of the card in various qualities. cmc: float A float of the converted mana cost of the card. type_line: str The full type line of the card. oracle_text: str The official oracle text of a card. mana_cost: str The full mana cost using shorthanded mana symbols. colors: arr An array of strings with all colors found in the mana cost. - color_identity: arr An array of strings with all colors found in on the card itself. + color_identity: arr An array of strings with all colors found on the card itself. legalities: dict A dictionary of all formats and their legality. reserved: bool Returns True if the card is on the reserved list. reprint: bool Returns True if the card has been reprinted before.