From 0101d3b3e4b01ce2309aacdaca6c9469aea41902 Mon Sep 17 00:00:00 2001 From: Ryan McGrath Date: Wed, 29 Jul 2009 12:54:33 -0400 Subject: [PATCH] Fixing a bug wherein self.headers doesn't exist - reference headers arg instead --- build/lib/tango/tango.py | 4 ++-- tango/tango.py | 6 +++--- tango/tango3k.py | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/lib/tango/tango.py b/build/lib/tango/tango.py index 87d1098..340ba59 100644 --- a/build/lib/tango/tango.py +++ b/build/lib/tango/tango.py @@ -63,8 +63,8 @@ class setup: self.auth_manager.add_password(None, "http://twitter.com", self.username, self.password) self.handler = urllib2.HTTPBasicAuthHandler(self.auth_manager) self.opener = urllib2.build_opener(self.handler) - if self.headers is not None: - self.opener.addheaders = [('User-agent', self.headers)] + if headers is not None: + self.opener.addheaders = [('User-agent', headers)] try: test_verify = simplejson.load(self.opener.open("http://twitter.com/account/verify_credentials.json")) self.authenticated = True diff --git a/tango/tango.py b/tango/tango.py index 87d1098..e16bbe9 100644 --- a/tango/tango.py +++ b/tango/tango.py @@ -63,10 +63,10 @@ class setup: self.auth_manager.add_password(None, "http://twitter.com", self.username, self.password) self.handler = urllib2.HTTPBasicAuthHandler(self.auth_manager) self.opener = urllib2.build_opener(self.handler) - if self.headers is not None: - self.opener.addheaders = [('User-agent', self.headers)] + if headers is not None: + self.opener.addheaders = [('User-agent', headers)] try: - test_verify = simplejson.load(self.opener.open("http://twitter.com/account/verify_credentials.json")) + simplejson.load(self.opener.open("http://twitter.com/account/verify_credentials.json")) self.authenticated = True except HTTPError, e: raise TangoError("Authentication failed with your provided credentials. Try again? (%s failure)" % `e.code`, e.code) diff --git a/tango/tango3k.py b/tango/tango3k.py index 201b3e6..77f930e 100644 --- a/tango/tango3k.py +++ b/tango/tango3k.py @@ -23,7 +23,7 @@ except ImportError: try: import json as simplejson except: - raise Exception("Tango requires the simplejson library (or Python 2.6) to work. http://www.undefined.org/python/") + raise Exception("Tango requires a json library to work. http://www.undefined.org/python/") try: import oauth @@ -63,8 +63,8 @@ class setup: self.auth_manager.add_password(None, "http://twitter.com", self.username, self.password) self.handler = urllib.request.HTTPBasicAuthHandler(self.auth_manager) self.opener = urllib.request.build_opener(self.handler) - if self.headers is not None: - self.opener.addheaders = [('User-agent', self.headers)] + if headers is not None: + self.opener.addheaders = [('User-agent', headers)] try: test_verify = simplejson.load(self.opener.open("http://twitter.com/account/verify_credentials.json")) self.authenticated = True