Not 100% working yet, but I'm replacing httplib2 and poster with requests

Author: Ross Karchner

.gitignore

@@ -0,0 +1,4 @@
+
+socrata.cfg
+
+Socrata.pyc

Socrata.py

@@ -15,12 +15,13 @@
 """
 
 import json
-import re
-from poster.encode import multipart_encode
-from poster.streaminghttp import register_openers
-from httplib2 import Http
+import re, logging
+import requests
 from urllib import urlencode
-from urllib2 import Request, urlopen
+
+
+DEBUG=False
+
 
 class SocrataBase:
     """Base class for all Socrata API objects"""
@@ -32,26 +33,25 @@ def __init__(self, configuration):
         """
 
         self.config = configuration
-        self.username, password, host = (self.config.get('credentials', 'user'),
+        self.username, self.password, self.host = (self.config.get('credentials', 'user'),
             self.config.get('credentials', 'password'),
             self.config.get('server', 'host'))
 
         self.app_token  = self.config.get('credentials', 'app_token')
-        self.api        = Http()
-        self.url        = host
+        self.url        = self.host
         self.id_pattern = re.compile('^[0-9a-z]{4}-[0-9a-z]{4}$')
-        self.api.add_credentials(self.username, password)
-
-        # For multipart upload/streaming
-        register_openers()
 
-    def _request(self, service, type, data = {}):
+    def _request(self, service, type='GET', data = {}):
         """Generic HTTP request, encoding data as JSON and decoding the response"""
-        response, content = self.api.request(
-            self.url + service, type,
-            headers = { 'Content-type:': 'application/json',
+        client= getattr(requests, type.lower())
+        uri=self.url + service
+        logging.warning(uri)
+        response= client(uri + service,
+        headers = { 'Content-type:': 'application/json',
               'X-App-Token': self.app_token },
-            body = json.dumps(data) )
+            data = json.dumps(data), auth=(self.username, self.password ))
+            
+        content=response.text
         if content != None and len(content) > 0:
             response_parsed = json.loads(content)
             if hasattr(response_parsed, 'has_key') and \
@@ -167,8 +167,8 @@ def multipart_post(self, url, filename, field='file'):
         headers['X-App-Token'] = self.app_token
 
         request = Request("%s%s" % (self.url, url), datagen, headers)
-        response = urlopen(request).read()
-        return json.loads(response)
+        response = request.get(request).read()
+        return json.loads(response.text)
 
     # Is the string 'id' a valid four-four ID?
     def is_id(self, id):

rss_capturer.py

@@ -8,8 +8,9 @@
 import feedparser
 from xml.dom import minidom
 
-REDDIT_RSS = "http://www.reddit.com/.rss"
+Socrata.DEBUG=True
 
+REDDIT_RSS = "http://www.reddit.com/.rss"
 
 
 def create_dataset_with_columns(dataset, title = 'RSS Feed Dataset', description = ''):
@@ -41,8 +42,10 @@ def create_dataset_with_columns(dataset, title = 'RSS Feed Dataset', description
     dataset = Socrata.Dataset(cfg)
 
     print "Searching for existing dataset"
+    #import pdb;pdb.set_trace()
     existing = dataset.find_datasets({'q':'RSS Feed Dataset',
-        'for_user': dataset.username})[0]
+        'for_user': dataset.username})
+    
     if existing['count'] > 0:
         print "Dataset exists, using it"
         dataset.use_existing(existing['results'][0]['id'])

setup.py

@@ -8,7 +8,7 @@
   version = '0.2',
   packages = find_packages(),
 
-  install_requires=['feedparser','httplib2','poster'],
+  install_requires=['feedparser','requests','poster'],
 
   author = 'Aiden Scandella',
   author_email = '[email protected]',