Merge branch 'develop' of github.com:NandaScott/Scrython into nanda/cards_search

scrython/cards/autocomplete.py

@@ -1,24 +1,10 @@
 import asyncio, aiohttp
 
 class Autocomplete(object):
-	""" cards/autocomplete
-
-	Parameters:
-		query: str		The string to autocomplete.
-		format: str		The data format to return. Currently only supports JSON.
-		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.
-		total_items: int	Returns the number of items in data.
-		data: arr			The full autocompleted list.
-
-	"""
-
 	def __init__(self, query, **kwargs):
 		self.query = query
-		self.pretty = kwargs.get('pretty')
-		self.format = kwargs.get('format')
+		self.pretty = kwargs.get('pretty', 'None')
+		self.format = kwargs.get('format', 'None')
 		loop = asyncio.get_event_loop()
 		self.session = aiohttp.ClientSession(loop=loop)
 

scrython/cards/cardid.py

@@ -1,12 +1,6 @@
-from .scryfall_object import ScryfallObject
-
-class Id(ScryfallObject):
-	""" cards/:id
-
-	Parameters:
-		id: str					The Scryfall id of the card.
-	"""
+from .cards_object import CardsObject
 
+class Id(CardsObject):
 	def __init__(self, **kwargs):
 		self.id = kwargs.get('id')
 		self.url = 'cards/' + str(self.id)

scrython/cards/cards_object.py

@@ -1,7 +1,7 @@
 import aiohttp
 import asyncio
 
-class ScryfallObject(object):
+class CardsObject(object):
 	def __init__(self, _url, **kwargs):
 		self._url = 'https://api.scryfall.com/' + _url
 		loop = asyncio.get_event_loop()
@@ -14,10 +14,10 @@ class ScryfallObject(object):
 		self.scryfallJson = loop.run_until_complete(getRequest(
 			url = self._url,
 			params={
-				'format': kwargs.get('format'),
-				'face': kwargs.get('face'),
-				'version': kwargs.get('version'),
-				'pretty': kwargs.get('pretty')
+				'format': kwargs.get('format', 'None'),
+				'face': kwargs.get('face', 'None'),
+				'version': kwargs.get('version', 'None'),
+				'pretty': kwargs.get('pretty', 'None')
 			}))
 
 		if self.scryfallJson['object'] == 'error':

scrython/cards/collector.py

@@ -1,13 +1,6 @@
-from .scryfall_object import ScryfallObject
-
-class Collector(ScryfallObject):
-	""" cards/:code/:collector_number
-
-	Parameters:
-		code: str				The 3 or 4 letter set code.
-		collector_number: int	The collector number of the card.
-	"""
+from .cards_object import CardsObject
 
+class Collector(CardsObject):
 	def __init__(self, **kwargs):
 		self.code = kwargs.get('code')
 		self.collector_number = kwargs.get('collector_number')

scrython/cards/mtgo.py

@@ -1,14 +1,7 @@
-from .scryfall_object import ScryfallObject
+from .cards_object import CardsObject
 import urllib.parse
 
-class Mtgo(ScryfallObject):
-	""" cards/mtgo/:id
-
-	Parameters:
-		id: int		The mtgo id of the card.
-
-	"""
-
+class Mtgo(CardsObject):
 	def __init__(self, **kwargs):
 		self.mtgoid = kwargs.get('id')
 		self.url = 'cards/mtgo/' + str(self.mtgoid)

scrython/cards/multiverse.py

@@ -1,11 +1,6 @@
-from .scryfall_object import ScryfallObject
-
-class Multiverse(ScryfallObject):
-	"""
-	Parameters:
-		id: int		The multiverse id of the card.
-	"""
+from .cards_object import CardsObject
 
+class Multiverse(CardsObject):
 	def __init__(self, **kwargs):
 		self.multiverseid = kwargs.get('id')
 		self.url = 'cards/multiverse/' + self.multiverseid

scrython/cards/named.py

@@ -1,18 +1,11 @@
-from .scryfall_object import ScryfallObject
+from .cards_object import CardsObject
 import urllib.parse
 
-class Named(ScryfallObject):
-	"""
-	Parameters:
-		exact: str				The exact card name to search for, case insenstive.
-		fuzzy: str				A fuzzy card name to search for.
-		set: str				A set code to limit the search to one set.
-	"""
-
+class Named(CardsObject):
 	def __init__(self, **kwargs):
 		self.exact = kwargs.get('exact')
 		self.fuzzy = kwargs.get('fuzzy')
-		self.set = kwargs.get('set')
+		self.set = kwargs.get('set', 'None')
 		self.dict = {}
 
 		if self.exact is not None:

scrython/cards/randomcard.py

@@ -1,8 +1,7 @@
-from .scryfall_object import ScryfallObject
+from .cards_object import CardsObject
 
 
-class Random(ScryfallObject):
-    """This will return a random card. No parameters are passed while creating."""
+class Random(CardsObject):
     def __init__(self):
         self.url = 'cards/random'
         super(Random, self).__init__(self.url)

scrython/rulings/rulings_object.py

@@ -3,8 +3,8 @@ import aiohttp
 
 class RulingsObject(object):
 	def __init__(self, _url, **kwargs):
-		self.pretty = kwargs.get('pretty')
-		self.format = kwargs.get('format')
+		self.pretty = kwargs.get('pretty', 'None')
+		self.format = kwargs.get('format', 'None')
 		self._url = 'https://api.scryfall.com/' + _url
 		loop = asyncio.get_event_loop()
 		self.session = aiohttp.ClientSession(loop=loop)