phasing out the api class

6 files changed, 3 insertions, 14 deletions

diff --git a/ricky/config.py b/ricky/config.py
index 0cbcbb1..1cf3255 100644
--- a/ricky/config.py
+++ b/ricky/config.py
@@ -15,13 +15,8 @@ def _add_pb_base(path):
     return os.path.join(PB_BASE, path)
 
 PATTERN_URL_BASE = _add_pb_base("impattern/patterns")
-IMPATTERN_URL = _add_pb_base("im/api/impattern")
-IMGRID_URL = _add_pb_base("im/api/imgrid")
-IMGRADIENT_URL = _add_pb_base("im/api/imgradient")
-IMBREAK_URL = _add_pb_base("im/api/imbreak")
 PB_DATA_URL = _add_pb_base("im/data")
 
-# aliased for merge
 PBPATTERN_URL = _add_pb_base("im/api/impattern")
 PBGRID_URL = _add_pb_base("im/api/imgrid")
 PBGRADIENT_URL = _add_pb_base("im/api/imgradient")
diff --git a/ricky/pb.py b/ricky/pb.py
index 456ff85..10d9504 100644
--- a/ricky/pb.py
+++ b/ricky/pb.py
@@ -24,7 +24,7 @@ class Pb(object):
                         instance.file_s3move()
                     return instance.file_dict()
         return json.loads(
-            utils.http_request(self.url, params=params.as_dict())
+            utils.http_request(params._url, params=params.as_dict())
         )
 
     def data_from_url(self, url):
diff --git a/ricky/pbbreaker/__init__.py b/ricky/pbbreaker/__init__.py
index e17f77f..cb76b15 100644
--- a/ricky/pbbreaker/__init__.py
+++ b/ricky/pbbreaker/__init__.py
@@ -1,12 +1,10 @@
 from ricky.pb import Pb
 from ricky.pbbreaker.params import Params
-from ricky.config import IMBREAK_URL
 
 
 class PbBreaker(Pb):
     def __init__(self):
         super(PbBreaker, self).__init__()
-        self.url = IMBREAK_URL
 
     def params_init(self):
         new_params = Params()
diff --git a/ricky/pbgradient/__init__.py b/ricky/pbgradient/__init__.py
index 96b15a5..3de11f4 100644
--- a/ricky/pbgradient/__init__.py
+++ b/ricky/pbgradient/__init__.py
@@ -1,13 +1,11 @@
 """class for the imgradient api handler"""
 from ricky.pb import Pb
 from ricky.pbgradient.params import Params
-from ricky.config import IMGRADIENT_URL
 
 
 class PbGradient(Pb):
     def __init__(self):
         super(PbGradient, self).__init__()
-        self.url = IMGRADIENT_URL
 
     def params_init(self):
         new_params = Params()
diff --git a/ricky/pbgrid/__init__.py b/ricky/pbgrid/__init__.py
index d94b0a1..ed195d0 100644
--- a/ricky/pbgrid/__init__.py
+++ b/ricky/pbgrid/__init__.py
@@ -1,11 +1,10 @@
 from ricky.pb import Pb
 from ricky.pbgrid.params import Params
-from ricky.config import IMGRID_URL
 
 
 class PbGrid(Pb):
     def __init__(self):
-        self.url = IMGRID_URL
+        pass
 
     def params_init(self):
         new_params = Params()
diff --git a/ricky/pbpattern/__init__.py b/ricky/pbpattern/__init__.py
index 4351713..78af181 100755
--- a/ricky/pbpattern/__init__.py
+++ b/ricky/pbpattern/__init__.py
@@ -1,11 +1,10 @@
 from ricky.pb import Pb
 from ricky.pbpattern.params import Params
-from ricky.config import IMPATTERN_URL
 
 
 class PbPattern(Pb):
     def __init__(self):
-        self.url = IMPATTERN_URL
+        pass
 
     def params_init(self):
         new_params = Params()