Merge branch 'master' of github.com:fwix/fwix_geoapi_python

Author: Sonia Fajardo

README

@@ -0,0 +1,19 @@
+These files will get you going with the Fwix geo api!
+
+You can get a free API key at 
+
+http://developers.fwix.com
+
+Included in this repository:
+
+./fwix_geo_api - the Fwix geo api packge
+./sample - a sample file to show you how to use the api
+./test - tests for the geo api package
+
+
+You can find or request help for any problems at:
+
+https://groups.google.com/group/fwix-api
+
+
+The Fwix Team

fwix_geo_api/fwix_geo_sample_code.py sample/fwix_geo_sample_code.py

@@ -1,10 +1,11 @@
 """
 Testing fwix_geo API
 """
+import sys
+sys.path.append("../")
+from fwix_geo_api.fwix_geo_api import *
 
-from fwix_geo_api import *
-
-kFWIX_API_KEY = '42a97fb59252'
+kFWIX_API_KEY = ''
 kFWIX_LAT = 37.787462
 kFWIX_LON = -122.399223
 kRANDOM_PLACE_UUID = '17f5fcd-3312-7a52-f551-d4e8f70dbc8a9'
@@ -87,4 +88,4 @@ def get_content_by_place(uuid, content_type):
 
 		print get_content_by_location(kFWIX_LAT, kFWIX_LON, kCONTENT_TYPE_STATUS_UPDATES)
 
-		print get_content_by_place(kRANDOM_PLACE_UUID, kCONTENT_TYPE_NEWS)
+		print get_content_by_place(kRANDOM_PLACE_UUID, kCONTENT_TYPE_NEWS)

fwix_geo_api/test_fwix_geo_api.py test/test_fwix_geo_api.py

@@ -1,5 +1,8 @@
 import unittest
-from fwix_geo_api import *
+
+import sys
+sys.path.append('..')
+from fwix_geo_api.fwix_geo_api import *
 
 kFWIX_API_KEY = '' # your api key
 kFWIX_LAT = 37.787462
@@ -58,4 +61,4 @@ def test_get_content_by_place(self):
             content = self.fx_api.get_content_by_place(kRANDOM_PLACE_UUID,content_type)
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()