From 2b2bb40913a6b2e4b068fe474a6cc49bceffcc89 Mon Sep 17 00:00:00 2001 From: jonathan vanasco Date: Tue, 23 Apr 2013 12:01:49 -0400 Subject: [PATCH] - fixed merge issue ( how did i miss that?!?) - added name to contributors --- README.md | 45 +++++++++++++++++++++++---------------------- twython/twython.py | 6 +----- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index c3fcca5..9d99e78 100644 --- a/README.md +++ b/README.md @@ -173,25 +173,26 @@ This is a list of all those who have contributed code to Twython in some way, sh exhaustive, but I could be wrong - if you think your name should be here and it's not, please contact me and let me know (or just issue a pull request on GitHub, and leave a note about it so I can just accept it ;)). -- **[Mike Helmick (michaelhelmick)](https://github.com/michaelhelmick)**, multiple fixes and proper `requests` integration. -- **[kracekumar](https://github.com/kracekumar)**, early `requests` work and various fixes. -- **[Erik Scheffers (eriks5)](https://github.com/eriks5)**, various fixes regarding OAuth callback URLs. -- **[Jordan Bouvier (jbouvier)](https://github.com/jbouvier)**, various fixes regarding OAuth callback URLs. -- **[Dick Brouwer (dikbrouwer)](https://github.com/dikbrouwer)**, fixes for OAuth Verifier in `get_authorized_tokens`. -- **[hades](https://github.com/hades)**, Fixes to various initial OAuth issues and updates to `Twython3k` to stay current. -- **[Alex Sutton (alexdsutton)](https://github.com/alexsdutton/twython/)**, fix for parameter substitution regular expression (catch underscores!). -- **[Levgen Pyvovarov (bsn)](https://github.com/bsn)**, Various argument fixes, cyrillic text support. -- **[Mark Liu (mliu7)](https://github.com/mliu7)**, Missing parameter fix for `addListMember`. -- **[Randall Degges (rdegges)](https://github.com/rdegges)**, PEP-8 fixes, MANIFEST.in, installer fixes. -- **[Idris Mokhtarzada (idris)](https://github.com/idris)**, Fixes for various example code pieces. -- **[Jonathan Elsas (jelsas)](https://github.com/jelsas)**, Fix for original Streaming API stub causing import errors. -- **[LuqueDaniel](https://github.com/LuqueDaniel)**, Extended example code where necessary. -- **[Mesar Hameed (mhameed)](https://github.com/mhameed)**, Commit to swap `__getattr__` trick for a more debuggable solution. -- **[Remy DeCausemaker (decause)](https://github.com/decause)**, PEP-8 contributions. -- **[mckellister](https://github.com/mckellister)**, Fixes to `Exception`s raised by Twython (Rate Limits, etc). -- **[tatz_tsuchiya](http://d.hatena.ne.jp/tatz_tsuchiya/20120115/1326623451)**, Fix for `lambda` scoping in key injection phase. -- **[Voulnet (Mohammed ALDOUB)](https://github.com/Voulnet)**, Fixes for `http`/`https` access endpoints -- **[fumieval](https://github.com/fumieval)**, Re-added Proxy support for 2.3.0. -- **[terrycojones](https://github.com/terrycojones)**, Error cleanup and Exception processing in 2.3.0. -- **[Leandro Ferreira](https://github.com/leandroferreira)**, Fix for double-encoding of search queries in 2.3.0. -- **[Chris Brown](https://github.com/chbrown)**, Updated to use v1.1 endpoints over v1 +- **[Mike Helmick (michaelhelmick)](https://github.com/michaelhelmick)**, multiple fixes and proper `requests` integration. +- **[kracekumar](https://github.com/kracekumar)**, early `requests` work and various fixes. +- **[Erik Scheffers (eriks5)](https://github.com/eriks5)**, various fixes regarding OAuth callback URLs. +- **[Jordan Bouvier (jbouvier)](https://github.com/jbouvier)**, various fixes regarding OAuth callback URLs. +- **[Dick Brouwer (dikbrouwer)](https://github.com/dikbrouwer)**, fixes for OAuth Verifier in `get_authorized_tokens`. +- **[hades](https://github.com/hades)**, Fixes to various initial OAuth issues and updates to `Twython3k` to stay current. +- **[Alex Sutton (alexdsutton)](https://github.com/alexsdutton/twython/)**, fix for parameter substitution regular expression (catch underscores!). +- **[Levgen Pyvovarov (bsn)](https://github.com/bsn)**, Various argument fixes, cyrillic text support. +- **[Mark Liu (mliu7)](https://github.com/mliu7)**, Missing parameter fix for `addListMember`. +- **[Randall Degges (rdegges)](https://github.com/rdegges)**, PEP-8 fixes, MANIFEST.in, installer fixes. +- **[Idris Mokhtarzada (idris)](https://github.com/idris)**, Fixes for various example code pieces. +- **[Jonathan Elsas (jelsas)](https://github.com/jelsas)**, Fix for original Streaming API stub causing import errors. +- **[LuqueDaniel](https://github.com/LuqueDaniel)**, Extended example code where necessary. +- **[Mesar Hameed (mhameed)](https://github.com/mhameed)**, Commit to swap `__getattr__` trick for a more debuggable solution. +- **[Remy DeCausemaker (decause)](https://github.com/decause)**, PEP-8 contributions. +- **[mckellister](https://github.com/mckellister)**, Fixes to `Exception`s raised by Twython (Rate Limits, etc). +- **[tatz_tsuchiya](http://d.hatena.ne.jp/tatz_tsuchiya/20120115/1326623451)**, Fix for `lambda` scoping in key injection phase. +- **[Voulnet (Mohammed ALDOUB)](https://github.com/Voulnet)**, Fixes for `http`/`https` access endpoints +- **[fumieval](https://github.com/fumieval)**, Re-added Proxy support for 2.3.0. +- **[terrycojones](https://github.com/terrycojones)**, Error cleanup and Exception processing in 2.3.0. +- **[Leandro Ferreira](https://github.com/leandroferreira)**, Fix for double-encoding of search queries in 2.3.0. +- **[Chris Brown](https://github.com/chbrown)**, Updated to use v1.1 endpoints over v1 +- **[Jonathan Vanasco](https://github.com/jvanasco)**, Debugging support, error_code tracking, Twitter error API tracking, other fixes diff --git a/twython/twython.py b/twython/twython.py index 4a9b61c..5c51279 100644 --- a/twython/twython.py +++ b/twython/twython.py @@ -82,11 +82,7 @@ class TwythonRateLimitError(TwythonError): class Twython(object): def __init__(self, app_key=None, app_secret=None, oauth_token=None, oauth_token_secret=None, \ -<<<<<<< HEAD - headers=None, callback_url=None, twitter_token=None, twitter_secret=None, proxies=None, version='1' , ssl_verify=True ): -======= - headers=None, callback_url=None, twitter_token=None, twitter_secret=None, proxies=None, version='1.1'): ->>>>>>> d6f3d731a2a89a0add5b01b918cf61cf93f97d62 + headers=None, callback_url=None, twitter_token=None, twitter_secret=None, proxies=None, version='1.1' , ssl_verify=True ): """Instantiates an instance of Twython. Takes optional parameters for authentication and such (see below). :param app_key: (optional) Your applications key