diff --git a/readability/auth.py b/readability/auth.py index 01e4a2d..124088e 100644 --- a/readability/auth.py +++ b/readability/auth.py @@ -45,10 +45,10 @@ def xauth(base_url_template=DEFAULT_READER_URL_TEMPLATE, **xargs): :param password: A password, otherwise read from READABILITY_PASSWORD. """ - consumer_key = xargs.get('consumer_key', required_from_env('READABILITY_CONSUMER_KEY')) - consumer_secret = xargs.get('consumer_secret', required_from_env('READABILITY_CONSUMER_SECRET')) - username = xargs.get('username', required_from_env('READABILITY_USERNAME')) - password = xargs.get('password', required_from_env('READABILITY_PASSWORD')) + consumer_key = xargs.get('consumer_key') or required_from_env('READABILITY_CONSUMER_KEY') + consumer_secret = xargs.get('consumer_secret') or required_from_env('READABILITY_CONSUMER_SECRET') + username = xargs.get('username') or required_from_env('READABILITY_USERNAME') + password = xargs.get('password') or required_from_env('READABILITY_PASSWORD') client = Client(consumer_key, client_secret=consumer_secret, signature_type='BODY') url = base_url_template.format(ACCESS_TOKEN_URL) diff --git a/setup.py b/setup.py old mode 100755 new mode 100644 index 8c67402..17ea32c --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ 'pytest', 'requests', 'requests_oauthlib', - 'httplib2==0.9.1', + 'httplib2==0.19.0', 'python-dateutil', ] @@ -20,7 +20,7 @@ setup( name='readability-api', - version='1.0.1', + version='1.0.2', description='Python client for the Readability Reader and Parser APIs.', long_description=open('README.rst').read(), author='The Readability Team',