From 4f08494370d226b168f485253db2d87ef2da4222 Mon Sep 17 00:00:00 2001 From: pepperpepperpepper Date: Sun, 4 Oct 2015 16:16:35 -0700 Subject: cleanup --- ricky/api.py | 29 ----------------------------- ricky/im.py | 29 +++++++++++++++++++++++++++++ ricky/imbreak/imbreak.py | 4 ++-- ricky/imgradient/imgradient.py | 4 ++-- ricky/imgrid/imgrid.py | 4 ++-- ricky/impattern/impattern.py | 4 ++-- 6 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 ricky/api.py create mode 100644 ricky/im.py diff --git a/ricky/api.py b/ricky/api.py deleted file mode 100644 index 93fa301..0000000 --- a/ricky/api.py +++ /dev/null @@ -1,29 +0,0 @@ -import urllib -import urllib2 -import sys -import random -import simplejson as json -import urllib2 - -class Api: - def __init__(self): - self._required_keys = [] - self.url = "" - def post_request(self, url, params): - params = urllib.urlencode(params) - headers = { - "Content-type": "application/x-www-form-urlencoded", - "User-Agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.94 Safari/537.36", - "Accept": "text/plain" - } - try: - req = urllib2.Request(url, params, headers) - response = urllib2.urlopen(req) - return response.read() - except Exception as e: - sys.stderr.write(str(e)) - raise - def call(self, params): - if not(params.is_ready()): - raise Exception("Api Params Not Ready") - return json.loads(self.post_request(self.url, params.as_hash())) diff --git a/ricky/im.py b/ricky/im.py new file mode 100644 index 0000000..91bf2c1 --- /dev/null +++ b/ricky/im.py @@ -0,0 +1,29 @@ +import urllib +import urllib2 +import sys +import random +import simplejson as json +import urllib2 + +class Im: + def __init__(self): + self._required_keys = [] + self.url = "" + def post_request(self, url, params): + params = urllib.urlencode(params) + headers = { + "Content-type": "application/x-www-form-urlencoded", + "User-Agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.94 Safari/537.36", + "Accept": "text/plain" + } + try: + req = urllib2.Request(url, params, headers) + response = urllib2.urlopen(req) + return response.read() + except Exception as e: + sys.stderr.write(str(e)) + raise + def call(self, params): + if not(params.is_ready()): + raise Exception("Im Params Not Ready") + return json.loads(self.post_request(self.url, params.as_hash())) diff --git a/ricky/imbreak/imbreak.py b/ricky/imbreak/imbreak.py index a9a4c95..9724911 100644 --- a/ricky/imbreak/imbreak.py +++ b/ricky/imbreak/imbreak.py @@ -1,8 +1,8 @@ -from ricky.api import Api +from ricky.api import Im from ricky.imbreak.params import ImBreakParams from ricky.config import IMBREAK_URL -class ImBreak(Api): +class ImBreak(Im): def __init__(self): self.url = IMBREAK_URL def params_init(self): diff --git a/ricky/imgradient/imgradient.py b/ricky/imgradient/imgradient.py index c7be83d..b6c9a1b 100644 --- a/ricky/imgradient/imgradient.py +++ b/ricky/imgradient/imgradient.py @@ -1,8 +1,8 @@ -from ricky.api import Api +from ricky.api import Im from ricky.imgradient.params import ImGradientParams from ricky.config import IMGRADIENT_URL -class ImGradient(Api): +class ImGradient(Im): def __init__(self): self.url = IMGRADIENT_URL def params_init(self): diff --git a/ricky/imgrid/imgrid.py b/ricky/imgrid/imgrid.py index 6872537..ed5b43c 100644 --- a/ricky/imgrid/imgrid.py +++ b/ricky/imgrid/imgrid.py @@ -1,8 +1,8 @@ -from ricky.api import Api +from ricky.api import Im from ricky.imgrid.params import ImGridParams from ricky.config import IMGRID_URL -class ImGrid(Api): +class ImGrid(Im): def __init__(self): self.url = IMGRID_URL def params_init(self): diff --git a/ricky/impattern/impattern.py b/ricky/impattern/impattern.py index 847ae84..885649c 100755 --- a/ricky/impattern/impattern.py +++ b/ricky/impattern/impattern.py @@ -1,8 +1,8 @@ -from ricky.api import Api +from ricky.api import Im from ricky.impattern.params import ImPatternParams from ricky.config import IMPATTERN_URL -class ImPattern(Api): +class ImPattern(Im): def __init__(self): self.url = IMPATTERN_URL def params_init(self): -- cgit v1.2.3-70-g09d2