Broke into 2 files

codeforamerica · Apr 16, 2011 · 3ca029c · 3ca029c
1 parent 036d84c
commit 3ca029c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 49 deletions.
diff --git a/__init__.py b/__init__.py
diff --git a/broadband_api.py b/broadband_api.py
@@ -1,25 +1,7 @@
-import urllib
+from generic_api import *
-import json
-
-# Inheritable class to perform requests to generic APIs.
-class BaseAPIRequest:
-  def __init__(self, url):
-    self.url = url
-
-  #Inherit this method to describe how to format URLs.
-  def format_url(self):
-    pass
-
-  # Requests the API and returns the JSON object.
-  def request(self, **args):
-    self.format_url(**args)
-    object = json.loads("".join([l for l in urllib.urlopen(self.url)]))
-    return object
-
-
-
 
 # Simple Python wrapper around the Broadband API provided by the FCC.
+
 class BroadbandApi(BaseAPIRequest):
   def __init__(self):
     BaseAPIRequest.__init__(self, "http://data.fcc.gov/api/speedtest/find?latitude=%s&longitude=%s&format=json")

diff --git a/fcc_api.py b/fcc_api.py
diff --git a/generic_api.py b/generic_api.py
@@ -0,0 +1,17 @@
+import urllib
+import json
+
+# Inheritable class to perform requests to generic APIs.
+class BaseAPIRequest:
+  def __init__(self, url):
+    self.url = url
+
+  #Inherit this method to describe how to format URLs.
+  def format_url(self):
+    pass
+
+  # Requests the API and returns the JSON object.
+  def request(self, **args):
+    self.format_url(**args)
+    object = json.loads("".join([l for l in urllib.urlopen(self.url)]))
+    return object
diff --git a/generic_api.pyc b/generic_api.pyc