Commit a4e16f36 authored by Josh Roesslein's avatar Josh Roesslein
Browse files

Revert "Added support for callbacks."

This reverts commit 58ee4790.
parent 686561be
import httplib
import urllib
from threading import Thread
from parsers import parse_error
from error import TweepError
def bind_api(path, parser, allowed_param=None, method='GET', require_auth=False):
def do_request(url, parameters, api):
def _call(api, *args, **kargs):
# If require auth, throw exception if credentials not provided
if require_auth and not api._b64up:
raise TweepError('Authentication required!')
# Filter out unallowed parameters
if allowed_param:
parameters = dict((k,v) for k,v in kargs.items() if k in allowed_param)
else:
parameters = None
# Open connection
if api.secure:
conn = httplib.HTTPSConnection(api.host)
else:
conn = httplib.HTTPConnection(api.host)
# Build url with parameters
if parameters:
url = '%s?%s' % (path, urllib.urlencode(parameters))
else:
url = path
# Assemble headers
headers = {
'User-Agent': 'tweepy'
......@@ -38,34 +53,4 @@ def bind_api(path, parser, allowed_param=None, method='GET', require_auth=False)
conn.close()
return out
def async_request(url, parameters, api, callback):
out = do_request(url, parameters,api)
callback(out)
def call(api, *args, **kargs):
# If require auth, throw exception if credentials not provided
if require_auth and not api._b64up:
raise TweepError('Authentication required!')
# Filter out unallowed parameters
if allowed_param:
parameters = dict((k,v) for k,v in kargs.items() if k in allowed_param)
else:
parameters = None
# Build url with parameters
if parameters:
url = '%s?%s' % (path, urllib.urlencode(parameters))
else:
url = path
# check for callback
callback = kargs.get('callback')
if callback:
# execute request async
Thread(target=async_request, args=(url, parameters, api, callback,)).start()
else:
# execute request sync
return do_request(url, parameters, api)
return call
return _call
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment