From 405909544c1a9adf4e9f8aca8e9131c062371b03 Mon Sep 17 00:00:00 2001 From: Tom Date: Thu, 28 Jun 2018 18:33:39 -0400 Subject: [PATCH] Adds Pipfile support (#25) * Added ability to read local metadata and search for funding links * Fixes running tests via tox Corrected linting errors and removed rouge 'print' calls. Moved to using nosetest as the setup.py test runner. This is mainly as nose give clearer error messages when something goes wrong. Also of note there were pinned dependencies which have been changed to 'at least' version dependencies. For reasons why see https://caremad.io/posts/2013/07/setup-vs-requirement/ Laster, we currently have a README.md and a README.rst. I'm unsure which one of these we mean to use. Shouldn't we at the very least keep all of the following in the same markup format: README, HISTORY, CONTRIBUTING, AUTHORS, * Attempts to make clever code more readable * Refactors cli and thanks.py in preparation Pipfile processing * Adds logger and activate level=DEBUG on cli flag * Adds ability to process Pipfile's * Flake8ification * Corrects relative import for py27 * Addresses @phildini suggestions - thanks.rocks is confusing - removes commented out code * Fixes travis test invocation and updates tox to match - Moves to py.test as gives better error messages * Forced add fixture files (.egg) which were causing failing tests .egg files are sensibly added to .gitignore This is probably one of the very few cases where you want to add a .egg file :) --- .travis.yml | 1 + requirements_dev.txt | 1 + setup.cfg | 2 +- setup.py | 5 +- .../crunchy_frog-0.2.egg-info/PKG-INFO | 1668 +++++++++++++++++ .../crunchy_frog-0.2.egg-info/SOURCES.txt | 46 + .../dependency_links.txt | 1 + .../installed-files.txt | 42 + .../crunchy_frog-0.2.egg-info/not-zip-safe | 1 + .../crunchy_frog-0.2.egg-info/requires.txt | 15 + .../crunchy_frog-0.2.egg-info/top_level.txt | 1 + tests/test_thanks.py | 64 +- thanks/__init__.py | 4 + thanks/cli.py | 41 +- thanks/thanks.py | 132 +- tox.ini | 5 +- 16 files changed, 1961 insertions(+), 68 deletions(-) create mode 100644 tests/fixtures/crunchy_frog-0.2.egg-info/PKG-INFO create mode 100644 tests/fixtures/crunchy_frog-0.2.egg-info/SOURCES.txt create mode 100644 tests/fixtures/crunchy_frog-0.2.egg-info/dependency_links.txt create mode 100644 tests/fixtures/crunchy_frog-0.2.egg-info/installed-files.txt create mode 100644 tests/fixtures/crunchy_frog-0.2.egg-info/not-zip-safe create mode 100644 tests/fixtures/crunchy_frog-0.2.egg-info/requires.txt create mode 100644 tests/fixtures/crunchy_frog-0.2.egg-info/top_level.txt diff --git a/.travis.yml b/.travis.yml index 94d7067..0dd26d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ install: # Command to run tests, e.g. python setup.py test script: - flake8 thanks + - pip list - python setup.py test diff --git a/requirements_dev.txt b/requirements_dev.txt index 9647798..6c8ebda 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -8,3 +8,4 @@ coverage==4.4.2 Sphinx==1.6.5 twine==1.9.1 ddt +pytest diff --git a/setup.cfg b/setup.cfg index b087132..359d05c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -19,4 +19,4 @@ exclude = docs max-line-length = 120 [aliases] - +test=pytest diff --git a/setup.py b/setup.py index 9cf96e5..924c1c0 100644 --- a/setup.py +++ b/setup.py @@ -18,13 +18,15 @@ 'termcolor>=1', 'setuptools>=', 'requests>=2', + 'toml' ] setup_requirements = [ - 'nose' + "pytest-runner" ] test_requirements = [ + "pytest", 'ddt', ] @@ -62,7 +64,6 @@ 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', ], - test_suite='nose.collector', tests_require=test_requirements, setup_requires=setup_requirements, ) diff --git a/tests/fixtures/crunchy_frog-0.2.egg-info/PKG-INFO b/tests/fixtures/crunchy_frog-0.2.egg-info/PKG-INFO new file mode 100644 index 0000000..67f2c80 --- /dev/null +++ b/tests/fixtures/crunchy_frog-0.2.egg-info/PKG-INFO @@ -0,0 +1,1668 @@ +Metadata-Version: 2.1 +Name: requests +Version: 0.2 +Summary: Python HTTP for Humans. +Home-page: http://python-requests.org +Author: Kenneth Reitz +Author-email: me@kennethreitz.org +License: Apache 2.0 +Description: Requests: HTTP for Humans + ========================= + + .. image:: https://img.shields.io/pypi/v/requests.svg + :target: https://pypi.python.org/pypi/requests + + .. image:: https://img.shields.io/pypi/l/requests.svg + :target: https://pypi.python.org/pypi/requests + + .. image:: https://img.shields.io/pypi/pyversions/requests.svg + :target: https://pypi.python.org/pypi/requests + + .. image:: https://codecov.io/github/requests/requests/coverage.svg?branch=master + :target: https://codecov.io/github/requests/requests + :alt: codecov.io + + .. image:: https://img.shields.io/github/contributors/requests/requests.svg + :target: https://github.com/requests/requests/graphs/contributors + + .. image:: https://img.shields.io/badge/Say%20Thanks-!-1EAEDB.svg + :target: https://saythanks.io/to/kennethreitz + + + + Requests is the only *Non-GMO* HTTP library for Python, safe for human + consumption. + + **Warning:** Recreational use of the Python standard library for HTTP may result in dangerous side-effects, + including: security vulnerabilities, verbose code, reinventing the wheel, + constantly reading documentation, depression, headaches, or even death. + + Behold, the power of Requests: + + .. code-block:: python + + >>> r = requests.get('https://api.github.com/user', auth=('user', 'pass')) + >>> r.status_code + 200 + >>> r.headers['content-type'] + 'application/json; charset=utf8' + >>> r.encoding + 'utf-8' + >>> r.text + u'{"type":"User"...' + >>> r.json() + {u'disk_usage': 368627, u'private_gists': 484, ...} + + See `the similar code, sans Requests `_. + + .. image:: https://raw.githubusercontent.com/requests/requests/master/docs/_static/requests-logo-small.png + :target: http://docs.python-requests.org/ + + + Requests allows you to send *organic, grass-fed* HTTP/1.1 requests, without the + need for manual labor. There's no need to manually add query strings to your + URLs, or to form-encode your POST data. Keep-alive and HTTP connection pooling + are 100% automatic, thanks to `urllib3 `_. + + Besides, all the cool kids are doing it. Requests is one of the most + downloaded Python packages of all time, pulling in over 11,000,000 downloads + every month. You don't want to be left out! + + Feature Support + --------------- + + Requests is ready for today's web. + + - International Domains and URLs + - Keep-Alive & Connection Pooling + - Sessions with Cookie Persistence + - Browser-style SSL Verification + - Basic/Digest Authentication + - Elegant Key/Value Cookies + - Automatic Decompression + - Automatic Content Decoding + - Unicode Response Bodies + - Multipart File Uploads + - HTTP(S) Proxy Support + - Connection Timeouts + - Streaming Downloads + - ``.netrc`` Support + - Chunked Requests + + Requests officially supports Python 2.6–2.7 & 3.3–3.7, and runs great on PyPy. + + Installation + ------------ + + To install Requests, simply: + + .. code-block:: bash + + $ pip install requests + ✨🍰✨ + + Satisfaction guaranteed. + + Documentation + ------------- + + Fantastic documentation is available at http://docs.python-requests.org/, for a limited time only. + + + How to Contribute + ----------------- + + #. Check for open issues or open a fresh issue to start a discussion around a feature idea or a bug. There is a `Contributor Friendly`_ tag for issues that should be ideal for people who are not very familiar with the codebase yet. + #. Fork `the repository`_ on GitHub to start making your changes to the **master** branch (or branch off of it). + #. Write a test which shows that the bug was fixed or that the feature works as expected. + #. Send a pull request and bug the maintainer until it gets merged and published. :) Make sure to add yourself to AUTHORS_. + + .. _`the repository`: http://github.com/requests/requests + .. _AUTHORS: https://github.com/requests/requests/blob/master/AUTHORS.rst + .. _Contributor Friendly: https://github.com/requests/requests/issues?direction=desc&labels=Contributor+Friendly&page=1&sort=updated&state=open + + + .. :changelog: + + Release History + --------------- + + 2.18.4 (2017-08-15) + +++++++++++++++++++ + + **Improvements** + + - Error messages for invalid headers now include the header name for easier debugging + + **Dependencies** + + - We now support idna v2.6. + + 2.18.3 (2017-08-02) + +++++++++++++++++++ + + **Improvements** + + - Running ``$ python -m requests.help`` now includes the installed version of idna. + + **Bugfixes** + + - Fixed issue where Requests would raise ``ConnectionError`` instead of + ``SSLError`` when encountering SSL problems when using urllib3 v1.22. + + 2.18.2 (2017-07-25) + +++++++++++++++++++ + + **Bugfixes** + + - ``requests.help`` no longer fails on Python 2.6 due to the absence of + ``ssl.OPENSSL_VERSION_NUMBER``. + + **Dependencies** + + - We now support urllib3 v1.22. + + 2.18.1 (2017-06-14) + +++++++++++++++++++ + + **Bugfixes** + + - Fix an error in the packaging whereby the *.whl contained incorrect data that + regressed the fix in v2.17.3. + + 2.18.0 (2017-06-14) + +++++++++++++++++++ + + **Improvements** + + - ``Response`` is now a context manager, so can be used directly in a ``with`` statement + without first having to be wrapped by ``contextlib.closing()``. + + **Bugfixes** + + - Resolve installation failure if multiprocessing is not available + - Resolve tests crash if multiprocessing is not able to determine the number of CPU cores + - Resolve error swallowing in utils set_environ generator + + + 2.17.3 (2017-05-29) + +++++++++++++++++++ + + **Improvements** + + - Improved ``packages`` namespace identity support, for monkeypatching libraries. + + + 2.17.2 (2017-05-29) + +++++++++++++++++++ + + **Improvements** + + - Improved ``packages`` namespace identity support, for monkeypatching libraries. + + + 2.17.1 (2017-05-29) + +++++++++++++++++++ + + **Improvements** + + - Improved ``packages`` namespace identity support, for monkeypatching libraries. + + + 2.17.0 (2017-05-29) + +++++++++++++++++++ + + **Improvements** + + - Removal of the 301 redirect cache. This improves thread-safety. + + + 2.16.5 (2017-05-28) + +++++++++++++++++++ + + - Improvements to ``$ python -m requests.help``. + + 2.16.4 (2017-05-27) + +++++++++++++++++++ + + - Introduction of the ``$ python -m requests.help`` command, for debugging with maintainers! + + 2.16.3 (2017-05-27) + +++++++++++++++++++ + + - Further restored the ``requests.packages`` namespace for compatibility reasons. + + 2.16.2 (2017-05-27) + +++++++++++++++++++ + + - Further restored the ``requests.packages`` namespace for compatibility reasons. + + No code modification (noted below) should be neccessary any longer. + + 2.16.1 (2017-05-27) + +++++++++++++++++++ + + - Restored the ``requests.packages`` namespace for compatibility reasons. + - Bugfix for ``urllib3`` version parsing. + + **Note**: code that was written to import against the ``requests.packages`` + namespace previously will have to import code that rests at this module-level + now. + + For example:: + + from requests.packages.urllib3.poolmanager import PoolManager + + Will need to be re-written to be:: + + from requests.packages import urllib3 + urllib3.poolmanager.PoolManager + + Or, even better:: + + from urllib3.poolmanager import PoolManager + + 2.16.0 (2017-05-26) + +++++++++++++++++++ + + - Unvendor ALL the things! + + 2.15.1 (2017-05-26) + +++++++++++++++++++ + + - Everyone makes mistakes. + + 2.15.0 (2017-05-26) + +++++++++++++++++++ + + **Improvements** + + - Introduction of the ``Response.next`` property, for getting the next + ``PreparedResponse`` from a redirect chain (when ``allow_redirects=False``). + - Internal refactoring of ``__version__`` module. + + **Bugfixes** + + - Restored once-optional parameter for ``requests.utils.get_environ_proxies()``. + + 2.14.2 (2017-05-10) + +++++++++++++++++++ + + **Bugfixes** + + - Changed a less-than to an equal-to and an or in the dependency markers to + widen compatibility with older setuptools releases. + + 2.14.1 (2017-05-09) + +++++++++++++++++++ + + **Bugfixes** + + - Changed the dependency markers to widen compatibility with older pip + releases. + + 2.14.0 (2017-05-09) + +++++++++++++++++++ + + **Improvements** + + - It is now possible to pass ``no_proxy`` as a key to the ``proxies`` + dictionary to provide handling similar to the ``NO_PROXY`` environment + variable. + - When users provide invalid paths to certificate bundle files or directories + Requests now raises ``IOError``, rather than failing at the time of the HTTPS + request with a fairly inscrutable certificate validation error. + - The behavior of ``SessionRedirectMixin`` was slightly altered. + ``resolve_redirects`` will now detect a redirect by calling + ``get_redirect_target(response)`` instead of directly + querying ``Response.is_redirect`` and ``Response.headers['location']``. + Advanced users will be able to process malformed redirects more easily. + - Changed the internal calculation of elapsed request time to have higher + resolution on Windows. + - Added ``win_inet_pton`` as conditional dependency for the ``[socks]`` extra + on Windows with Python 2.7. + - Changed the proxy bypass implementation on Windows: the proxy bypass + check doesn't use forward and reverse DNS requests anymore + - URLs with schemes that begin with ``http`` but are not ``http`` or ``https`` + no longer have their host parts forced to lowercase. + + **Bugfixes** + + - Much improved handling of non-ASCII ``Location`` header values in redirects. + Fewer ``UnicodeDecodeErrors`` are encountered on Python 2, and Python 3 now + correctly understands that Latin-1 is unlikely to be the correct encoding. + - If an attempt to ``seek`` file to find out its length fails, we now + appropriately handle that by aborting our content-length calculations. + - Restricted ``HTTPDigestAuth`` to only respond to auth challenges made on 4XX + responses, rather than to all auth challenges. + - Fixed some code that was firing ``DeprecationWarning`` on Python 3.6. + - The dismayed person emoticon (``/o\\``) no longer has a big head. I'm sure + this is what you were all worrying about most. + + + **Miscellaneous** + + - Updated bundled urllib3 to v1.21.1. + - Updated bundled chardet to v3.0.2. + - Updated bundled idna to v2.5. + - Updated bundled certifi to 2017.4.17. + + 2.13.0 (2017-01-24) + +++++++++++++++++++ + + **Features** + + - Only load the ``idna`` library when we've determined we need it. This will + save some memory for users. + + **Miscellaneous** + + - Updated bundled urllib3 to 1.20. + - Updated bundled idna to 2.2. + + 2.12.5 (2017-01-18) + +++++++++++++++++++ + + **Bugfixes** + + - Fixed an issue with JSON encoding detection, specifically detecting + big-endian UTF-32 with BOM. + + 2.12.4 (2016-12-14) + +++++++++++++++++++ + + **Bugfixes** + + - Fixed regression from 2.12.2 where non-string types were rejected in the + basic auth parameters. While support for this behaviour has been readded, + the behaviour is deprecated and will be removed in the future. + + 2.12.3 (2016-12-01) + +++++++++++++++++++ + + **Bugfixes** + + - Fixed regression from v2.12.1 for URLs with schemes that begin with "http". + These URLs have historically been processed as though they were HTTP-schemed + URLs, and so have had parameters added. This was removed in v2.12.2 in an + overzealous attempt to resolve problems with IDNA-encoding those URLs. This + change was reverted: the other fixes for IDNA-encoding have been judged to + be sufficient to return to the behaviour Requests had before v2.12.0. + + 2.12.2 (2016-11-30) + +++++++++++++++++++ + + **Bugfixes** + + - Fixed several issues with IDNA-encoding URLs that are technically invalid but + which are widely accepted. Requests will now attempt to IDNA-encode a URL if + it can but, if it fails, and the host contains only ASCII characters, it will + be passed through optimistically. This will allow users to opt-in to using + IDNA2003 themselves if they want to, and will also allow technically invalid + but still common hostnames. + - Fixed an issue where URLs with leading whitespace would raise + ``InvalidSchema`` errors. + - Fixed an issue where some URLs without the HTTP or HTTPS schemes would still + have HTTP URL preparation applied to them. + - Fixed an issue where Unicode strings could not be used in basic auth. + - Fixed an issue encountered by some Requests plugins where constructing a + Response object would cause ``Response.content`` to raise an + ``AttributeError``. + + 2.12.1 (2016-11-16) + +++++++++++++++++++ + + **Bugfixes** + + - Updated setuptools 'security' extra for the new PyOpenSSL backend in urllib3. + + **Miscellaneous** + + - Updated bundled urllib3 to 1.19.1. + + 2.12.0 (2016-11-15) + +++++++++++++++++++ + + **Improvements** + + - Updated support for internationalized domain names from IDNA2003 to IDNA2008. + This updated support is required for several forms of IDNs and is mandatory + for .de domains. + - Much improved heuristics for guessing content lengths: Requests will no + longer read an entire ``StringIO`` into memory. + - Much improved logic for recalculating ``Content-Length`` headers for + ``PreparedRequest`` objects. + - Improved tolerance for file-like objects that have no ``tell`` method but + do have a ``seek`` method. + - Anything that is a subclass of ``Mapping`` is now treated like a dictionary + by the ``data=`` keyword argument. + - Requests now tolerates empty passwords in proxy credentials, rather than + stripping the credentials. + - If a request is made with a file-like object as the body and that request is + redirected with a 307 or 308 status code, Requests will now attempt to + rewind the body object so it can be replayed. + + **Bugfixes** + + - When calling ``response.close``, the call to ``close`` will be propagated + through to non-urllib3 backends. + - Fixed issue where the ``ALL_PROXY`` environment variable would be preferred + over scheme-specific variables like ``HTTP_PROXY``. + - Fixed issue where non-UTF8 reason phrases got severely mangled by falling + back to decoding using ISO 8859-1 instead. + - Fixed a bug where Requests would not correctly correlate cookies set when + using custom Host headers if those Host headers did not use the native + string type for the platform. + + **Miscellaneous** + + - Updated bundled urllib3 to 1.19. + - Updated bundled certifi certs to 2016.09.26. + + 2.11.1 (2016-08-17) + +++++++++++++++++++ + + **Bugfixes** + + - Fixed a bug when using ``iter_content`` with ``decode_unicode=True`` for + streamed bodies would raise ``AttributeError``. This bug was introduced in + 2.11. + - Strip Content-Type and Transfer-Encoding headers from the header block when + following a redirect that transforms the verb from POST/PUT to GET. + + 2.11.0 (2016-08-08) + +++++++++++++++++++ + + **Improvements** + + - Added support for the ``ALL_PROXY`` environment variable. + - Reject header values that contain leading whitespace or newline characters to + reduce risk of header smuggling. + + **Bugfixes** + + - Fixed occasional ``TypeError`` when attempting to decode a JSON response that + occurred in an error case. Now correctly returns a ``ValueError``. + - Requests would incorrectly ignore a non-CIDR IP address in the ``NO_PROXY`` + environment variables: Requests now treats it as a specific IP. + - Fixed a bug when sending JSON data that could cause us to encounter obscure + OpenSSL errors in certain network conditions (yes, really). + - Added type checks to ensure that ``iter_content`` only accepts integers and + ``None`` for chunk sizes. + - Fixed issue where responses whose body had not been fully consumed would have + the underlying connection closed but not returned to the connection pool, + which could cause Requests to hang in situations where the ``HTTPAdapter`` + had been configured to use a blocking connection pool. + + **Miscellaneous** + + - Updated bundled urllib3 to 1.16. + - Some previous releases accidentally accepted non-strings as acceptable header values. This release does not. + + 2.10.0 (2016-04-29) + +++++++++++++++++++ + + **New Features** + + - SOCKS Proxy Support! (requires PySocks; ``$ pip install requests[socks]``) + + **Miscellaneous** + + - Updated bundled urllib3 to 1.15.1. + + 2.9.2 (2016-04-29) + ++++++++++++++++++ + + **Improvements** + + - Change built-in CaseInsensitiveDict (used for headers) to use OrderedDict + as its underlying datastore. + + **Bugfixes** + + - Don't use redirect_cache if allow_redirects=False + - When passed objects that throw exceptions from ``tell()``, send them via + chunked transfer encoding instead of failing. + - Raise a ProxyError for proxy related connection issues. + + 2.9.1 (2015-12-21) + ++++++++++++++++++ + + **Bugfixes** + + - Resolve regression introduced in 2.9.0 that made it impossible to send binary + strings as bodies in Python 3. + - Fixed errors when calculating cookie expiration dates in certain locales. + + **Miscellaneous** + + - Updated bundled urllib3 to 1.13.1. + + 2.9.0 (2015-12-15) + ++++++++++++++++++ + + **Minor Improvements** (Backwards compatible) + + - The ``verify`` keyword argument now supports being passed a path to a + directory of CA certificates, not just a single-file bundle. + - Warnings are now emitted when sending files opened in text mode. + - Added the 511 Network Authentication Required status code to the status code + registry. + + **Bugfixes** + + - For file-like objects that are not seeked to the very beginning, we now + send the content length for the number of bytes we will actually read, rather + than the total size of the file, allowing partial file uploads. + - When uploading file-like objects, if they are empty or have no obvious + content length we set ``Transfer-Encoding: chunked`` rather than + ``Content-Length: 0``. + - We correctly receive the response in buffered mode when uploading chunked + bodies. + - We now handle being passed a query string as a bytestring on Python 3, by + decoding it as UTF-8. + - Sessions are now closed in all cases (exceptional and not) when using the + functional API rather than leaking and waiting for the garbage collector to + clean them up. + - Correctly handle digest auth headers with a malformed ``qop`` directive that + contains no token, by treating it the same as if no ``qop`` directive was + provided at all. + - Minor performance improvements when removing specific cookies by name. + + **Miscellaneous** + + - Updated urllib3 to 1.13. + + 2.8.1 (2015-10-13) + ++++++++++++++++++ + + **Bugfixes** + + - Update certificate bundle to match ``certifi`` 2015.9.6.2's weak certificate + bundle. + - Fix a bug in 2.8.0 where requests would raise ``ConnectTimeout`` instead of + ``ConnectionError`` + - When using the PreparedRequest flow, requests will now correctly respect the + ``json`` parameter. Broken in 2.8.0. + - When using the PreparedRequest flow, requests will now correctly handle a + Unicode-string method name on Python 2. Broken in 2.8.0. + + 2.8.0 (2015-10-05) + ++++++++++++++++++ + + **Minor Improvements** (Backwards Compatible) + + - Requests now supports per-host proxies. This allows the ``proxies`` + dictionary to have entries of the form + ``{'://': ''}``. Host-specific proxies will be used + in preference to the previously-supported scheme-specific ones, but the + previous syntax will continue to work. + - ``Response.raise_for_status`` now prints the URL that failed as part of the + exception message. + - ``requests.utils.get_netrc_auth`` now takes an ``raise_errors`` kwarg, + defaulting to ``False``. When ``True``, errors parsing ``.netrc`` files cause + exceptions to be thrown. + - Change to bundled projects import logic to make it easier to unbundle + requests downstream. + - Changed the default User-Agent string to avoid leaking data on Linux: now + contains only the requests version. + + **Bugfixes** + + - The ``json`` parameter to ``post()`` and friends will now only be used if + neither ``data`` nor ``files`` are present, consistent with the + documentation. + - We now ignore empty fields in the ``NO_PROXY`` environment variable. + - Fixed problem where ``httplib.BadStatusLine`` would get raised if combining + ``stream=True`` with ``contextlib.closing``. + - Prevented bugs where we would attempt to return the same connection back to + the connection pool twice when sending a Chunked body. + - Miscellaneous minor internal changes. + - Digest Auth support is now thread safe. + + **Updates** + + - Updated urllib3 to 1.12. + + 2.7.0 (2015-05-03) + ++++++++++++++++++ + + This is the first release that follows our new release process. For more, see + `our documentation + `_. + + **Bugfixes** + + - Updated urllib3 to 1.10.4, resolving several bugs involving chunked transfer + encoding and response framing. + + 2.6.2 (2015-04-23) + ++++++++++++++++++ + + **Bugfixes** + + - Fix regression where compressed data that was sent as chunked data was not + properly decompressed. (#2561) + + 2.6.1 (2015-04-22) + ++++++++++++++++++ + + **Bugfixes** + + - Remove VendorAlias import machinery introduced in v2.5.2. + + - Simplify the PreparedRequest.prepare API: We no longer require the user to + pass an empty list to the hooks keyword argument. (c.f. #2552) + + - Resolve redirects now receives and forwards all of the original arguments to + the adapter. (#2503) + + - Handle UnicodeDecodeErrors when trying to deal with a unicode URL that + cannot be encoded in ASCII. (#2540) + + - Populate the parsed path of the URI field when performing Digest + Authentication. (#2426) + + - Copy a PreparedRequest's CookieJar more reliably when it is not an instance + of RequestsCookieJar. (#2527) + + 2.6.0 (2015-03-14) + ++++++++++++++++++ + + **Bugfixes** + + - CVE-2015-2296: Fix handling of cookies on redirect. Previously a cookie + without a host value set would use the hostname for the redirected URL + exposing requests users to session fixation attacks and potentially cookie + stealing. This was disclosed privately by Matthew Daley of + `BugFuzz `_. This affects all versions of requests from + v2.1.0 to v2.5.3 (inclusive on both ends). + + - Fix error when requests is an ``install_requires`` dependency and ``python + setup.py test`` is run. (#2462) + + - Fix error when urllib3 is unbundled and requests continues to use the + vendored import location. + + - Include fixes to ``urllib3``'s header handling. + + - Requests' handling of unvendored dependencies is now more restrictive. + + **Features and Improvements** + + - Support bytearrays when passed as parameters in the ``files`` argument. + (#2468) + + - Avoid data duplication when creating a request with ``str``, ``bytes``, or + ``bytearray`` input to the ``files`` argument. + + 2.5.3 (2015-02-24) + ++++++++++++++++++ + + **Bugfixes** + + - Revert changes to our vendored certificate bundle. For more context see + (#2455, #2456, and http://bugs.python.org/issue23476) + + 2.5.2 (2015-02-23) + ++++++++++++++++++ + + **Features and Improvements** + + - Add sha256 fingerprint support. (`shazow/urllib3#540`_) + + - Improve the performance of headers. (`shazow/urllib3#544`_) + + **Bugfixes** + + - Copy pip's import machinery. When downstream redistributors remove + requests.packages.urllib3 the import machinery will continue to let those + same symbols work. Example usage in requests' documentation and 3rd-party + libraries relying on the vendored copies of urllib3 will work without having + to fallback to the system urllib3. + + - Attempt to quote parts of the URL on redirect if unquoting and then quoting + fails. (#2356) + + - Fix filename type check for multipart form-data uploads. (#2411) + + - Properly handle the case where a server issuing digest authentication + challenges provides both auth and auth-int qop-values. (#2408) + + - Fix a socket leak. (`shazow/urllib3#549`_) + + - Fix multiple ``Set-Cookie`` headers properly. (`shazow/urllib3#534`_) + + - Disable the built-in hostname verification. (`shazow/urllib3#526`_) + + - Fix the behaviour of decoding an exhausted stream. (`shazow/urllib3#535`_) + + **Security** + + - Pulled in an updated ``cacert.pem``. + + - Drop RC4 from the default cipher list. (`shazow/urllib3#551`_) + + .. _shazow/urllib3#551: https://github.com/shazow/urllib3/pull/551 + .. _shazow/urllib3#549: https://github.com/shazow/urllib3/pull/549 + .. _shazow/urllib3#544: https://github.com/shazow/urllib3/pull/544 + .. _shazow/urllib3#540: https://github.com/shazow/urllib3/pull/540 + .. _shazow/urllib3#535: https://github.com/shazow/urllib3/pull/535 + .. _shazow/urllib3#534: https://github.com/shazow/urllib3/pull/534 + .. _shazow/urllib3#526: https://github.com/shazow/urllib3/pull/526 + + 2.5.1 (2014-12-23) + ++++++++++++++++++ + + **Behavioural Changes** + + - Only catch HTTPErrors in raise_for_status (#2382) + + **Bugfixes** + + - Handle LocationParseError from urllib3 (#2344) + - Handle file-like object filenames that are not strings (#2379) + - Unbreak HTTPDigestAuth handler. Allow new nonces to be negotiated (#2389) + + 2.5.0 (2014-12-01) + ++++++++++++++++++ + + **Improvements** + + - Allow usage of urllib3's Retry object with HTTPAdapters (#2216) + - The ``iter_lines`` method on a response now accepts a delimiter with which + to split the content (#2295) + + **Behavioural Changes** + + - Add deprecation warnings to functions in requests.utils that will be removed + in 3.0 (#2309) + - Sessions used by the functional API are always closed (#2326) + - Restrict requests to HTTP/1.1 and HTTP/1.0 (stop accepting HTTP/0.9) (#2323) + + **Bugfixes** + + - Only parse the URL once (#2353) + - Allow Content-Length header to always be overridden (#2332) + - Properly handle files in HTTPDigestAuth (#2333) + - Cap redirect_cache size to prevent memory abuse (#2299) + - Fix HTTPDigestAuth handling of redirects after authenticating successfully + (#2253) + - Fix crash with custom method parameter to Session.request (#2317) + - Fix how Link headers are parsed using the regular expression library (#2271) + + **Documentation** + + - Add more references for interlinking (#2348) + - Update CSS for theme (#2290) + - Update width of buttons and sidebar (#2289) + - Replace references of Gittip with Gratipay (#2282) + - Add link to changelog in sidebar (#2273) + + 2.4.3 (2014-10-06) + ++++++++++++++++++ + + **Bugfixes** + + - Unicode URL improvements for Python 2. + - Re-order JSON param for backwards compat. + - Automatically defrag authentication schemes from host/pass URIs. (`#2249 `_) + + + 2.4.2 (2014-10-05) + ++++++++++++++++++ + + **Improvements** + + - FINALLY! Add json parameter for uploads! (`#2258 `_) + - Support for bytestring URLs on Python 3.x (`#2238 `_) + + **Bugfixes** + + - Avoid getting stuck in a loop (`#2244 `_) + - Multiple calls to iter* fail with unhelpful error. (`#2240 `_, `#2241 `_) + + **Documentation** + + - Correct redirection introduction (`#2245 `_) + - Added example of how to send multiple files in one request. (`#2227 `_) + - Clarify how to pass a custom set of CAs (`#2248 `_) + + + + 2.4.1 (2014-09-09) + ++++++++++++++++++ + + - Now has a "security" package extras set, ``$ pip install requests[security]`` + - Requests will now use Certifi if it is available. + - Capture and re-raise urllib3 ProtocolError + - Bugfix for responses that attempt to redirect to themselves forever (wtf?). + + + 2.4.0 (2014-08-29) + ++++++++++++++++++ + + **Behavioral Changes** + + - ``Connection: keep-alive`` header is now sent automatically. + + **Improvements** + + - Support for connect timeouts! Timeout now accepts a tuple (connect, read) which is used to set individual connect and read timeouts. + - Allow copying of PreparedRequests without headers/cookies. + - Updated bundled urllib3 version. + - Refactored settings loading from environment -- new `Session.merge_environment_settings`. + - Handle socket errors in iter_content. + + + 2.3.0 (2014-05-16) + ++++++++++++++++++ + + **API Changes** + + - New ``Response`` property ``is_redirect``, which is true when the + library could have processed this response as a redirection (whether + or not it actually did). + - The ``timeout`` parameter now affects requests with both ``stream=True`` and + ``stream=False`` equally. + - The change in v2.0.0 to mandate explicit proxy schemes has been reverted. + Proxy schemes now default to ``http://``. + - The ``CaseInsensitiveDict`` used for HTTP headers now behaves like a normal + dictionary when references as string or viewed in the interpreter. + + **Bugfixes** + + - No longer expose Authorization or Proxy-Authorization headers on redirect. + Fix CVE-2014-1829 and CVE-2014-1830 respectively. + - Authorization is re-evaluated each redirect. + - On redirect, pass url as native strings. + - Fall-back to autodetected encoding for JSON when Unicode detection fails. + - Headers set to ``None`` on the ``Session`` are now correctly not sent. + - Correctly honor ``decode_unicode`` even if it wasn't used earlier in the same + response. + - Stop advertising ``compress`` as a supported Content-Encoding. + - The ``Response.history`` parameter is now always a list. + - Many, many ``urllib3`` bugfixes. + + 2.2.1 (2014-01-23) + ++++++++++++++++++ + + **Bugfixes** + + - Fixes incorrect parsing of proxy credentials that contain a literal or encoded '#' character. + - Assorted urllib3 fixes. + + 2.2.0 (2014-01-09) + ++++++++++++++++++ + + **API Changes** + + - New exception: ``ContentDecodingError``. Raised instead of ``urllib3`` + ``DecodeError`` exceptions. + + **Bugfixes** + + - Avoid many many exceptions from the buggy implementation of ``proxy_bypass`` on OS X in Python 2.6. + - Avoid crashing when attempting to get authentication credentials from ~/.netrc when running as a user without a home directory. + - Use the correct pool size for pools of connections to proxies. + - Fix iteration of ``CookieJar`` objects. + - Ensure that cookies are persisted over redirect. + - Switch back to using chardet, since it has merged with charade. + + 2.1.0 (2013-12-05) + ++++++++++++++++++ + + - Updated CA Bundle, of course. + - Cookies set on individual Requests through a ``Session`` (e.g. via ``Session.get()``) are no longer persisted to the ``Session``. + - Clean up connections when we hit problems during chunked upload, rather than leaking them. + - Return connections to the pool when a chunked upload is successful, rather than leaking it. + - Match the HTTPbis recommendation for HTTP 301 redirects. + - Prevent hanging when using streaming uploads and Digest Auth when a 401 is received. + - Values of headers set by Requests are now always the native string type. + - Fix previously broken SNI support. + - Fix accessing HTTP proxies using proxy authentication. + - Unencode HTTP Basic usernames and passwords extracted from URLs. + - Support for IP address ranges for no_proxy environment variable + - Parse headers correctly when users override the default ``Host:`` header. + - Avoid munging the URL in case of case-sensitive servers. + - Looser URL handling for non-HTTP/HTTPS urls. + - Accept unicode methods in Python 2.6 and 2.7. + - More resilient cookie handling. + - Make ``Response`` objects pickleable. + - Actually added MD5-sess to Digest Auth instead of pretending to like last time. + - Updated internal urllib3. + - Fixed @Lukasa's lack of taste. + + 2.0.1 (2013-10-24) + ++++++++++++++++++ + + - Updated included CA Bundle with new mistrusts and automated process for the future + - Added MD5-sess to Digest Auth + - Accept per-file headers in multipart file POST messages. + - Fixed: Don't send the full URL on CONNECT messages. + - Fixed: Correctly lowercase a redirect scheme. + - Fixed: Cookies not persisted when set via functional API. + - Fixed: Translate urllib3 ProxyError into a requests ProxyError derived from ConnectionError. + - Updated internal urllib3 and chardet. + + 2.0.0 (2013-09-24) + ++++++++++++++++++ + + **API Changes:** + + - Keys in the Headers dictionary are now native strings on all Python versions, + i.e. bytestrings on Python 2, unicode on Python 3. + - Proxy URLs now *must* have an explicit scheme. A ``MissingSchema`` exception + will be raised if they don't. + - Timeouts now apply to read time if ``Stream=False``. + - ``RequestException`` is now a subclass of ``IOError``, not ``RuntimeError``. + - Added new method to ``PreparedRequest`` objects: ``PreparedRequest.copy()``. + - Added new method to ``Session`` objects: ``Session.update_request()``. This + method updates a ``Request`` object with the data (e.g. cookies) stored on + the ``Session``. + - Added new method to ``Session`` objects: ``Session.prepare_request()``. This + method updates and prepares a ``Request`` object, and returns the + corresponding ``PreparedRequest`` object. + - Added new method to ``HTTPAdapter`` objects: ``HTTPAdapter.proxy_headers()``. + This should not be called directly, but improves the subclass interface. + - ``httplib.IncompleteRead`` exceptions caused by incorrect chunked encoding + will now raise a Requests ``ChunkedEncodingError`` instead. + - Invalid percent-escape sequences now cause a Requests ``InvalidURL`` + exception to be raised. + - HTTP 208 no longer uses reason phrase ``"im_used"``. Correctly uses + ``"already_reported"``. + - HTTP 226 reason added (``"im_used"``). + + **Bugfixes:** + + - Vastly improved proxy support, including the CONNECT verb. Special thanks to + the many contributors who worked towards this improvement. + - Cookies are now properly managed when 401 authentication responses are + received. + - Chunked encoding fixes. + - Support for mixed case schemes. + - Better handling of streaming downloads. + - Retrieve environment proxies from more locations. + - Minor cookies fixes. + - Improved redirect behaviour. + - Improved streaming behaviour, particularly for compressed data. + - Miscellaneous small Python 3 text encoding bugs. + - ``.netrc`` no longer overrides explicit auth. + - Cookies set by hooks are now correctly persisted on Sessions. + - Fix problem with cookies that specify port numbers in their host field. + - ``BytesIO`` can be used to perform streaming uploads. + - More generous parsing of the ``no_proxy`` environment variable. + - Non-string objects can be passed in data values alongside files. + + 1.2.3 (2013-05-25) + ++++++++++++++++++ + + - Simple packaging fix + + + 1.2.2 (2013-05-23) + ++++++++++++++++++ + + - Simple packaging fix + + + 1.2.1 (2013-05-20) + ++++++++++++++++++ + + - 301 and 302 redirects now change the verb to GET for all verbs, not just + POST, improving browser compatibility. + - Python 3.3.2 compatibility + - Always percent-encode location headers + - Fix connection adapter matching to be most-specific first + - new argument to the default connection adapter for passing a block argument + - prevent a KeyError when there's no link headers + + 1.2.0 (2013-03-31) + ++++++++++++++++++ + + - Fixed cookies on sessions and on requests + - Significantly change how hooks are dispatched - hooks now receive all the + arguments specified by the user when making a request so hooks can make a + secondary request with the same parameters. This is especially necessary for + authentication handler authors + - certifi support was removed + - Fixed bug where using OAuth 1 with body ``signature_type`` sent no data + - Major proxy work thanks to @Lukasa including parsing of proxy authentication + from the proxy url + - Fix DigestAuth handling too many 401s + - Update vendored urllib3 to include SSL bug fixes + - Allow keyword arguments to be passed to ``json.loads()`` via the + ``Response.json()`` method + - Don't send ``Content-Length`` header by default on ``GET`` or ``HEAD`` + requests + - Add ``elapsed`` attribute to ``Response`` objects to time how long a request + took. + - Fix ``RequestsCookieJar`` + - Sessions and Adapters are now picklable, i.e., can be used with the + multiprocessing library + - Update charade to version 1.0.3 + + The change in how hooks are dispatched will likely cause a great deal of + issues. + + 1.1.0 (2013-01-10) + ++++++++++++++++++ + + - CHUNKED REQUESTS + - Support for iterable response bodies + - Assume servers persist redirect params + - Allow explicit content types to be specified for file data + - Make merge_kwargs case-insensitive when looking up keys + + 1.0.3 (2012-12-18) + ++++++++++++++++++ + + - Fix file upload encoding bug + - Fix cookie behavior + + 1.0.2 (2012-12-17) + ++++++++++++++++++ + + - Proxy fix for HTTPAdapter. + + 1.0.1 (2012-12-17) + ++++++++++++++++++ + + - Cert verification exception bug. + - Proxy fix for HTTPAdapter. + + 1.0.0 (2012-12-17) + ++++++++++++++++++ + + - Massive Refactor and Simplification + - Switch to Apache 2.0 license + - Swappable Connection Adapters + - Mountable Connection Adapters + - Mutable ProcessedRequest chain + - /s/prefetch/stream + - Removal of all configuration + - Standard library logging + - Make Response.json() callable, not property. + - Usage of new charade project, which provides python 2 and 3 simultaneous chardet. + - Removal of all hooks except 'response' + - Removal of all authentication helpers (OAuth, Kerberos) + + This is not a backwards compatible change. + + 0.14.2 (2012-10-27) + +++++++++++++++++++ + + - Improved mime-compatible JSON handling + - Proxy fixes + - Path hack fixes + - Case-Insensitive Content-Encoding headers + - Support for CJK parameters in form posts + + + 0.14.1 (2012-10-01) + +++++++++++++++++++ + + - Python 3.3 Compatibility + - Simply default accept-encoding + - Bugfixes + + + 0.14.0 (2012-09-02) + ++++++++++++++++++++ + + - No more iter_content errors if already downloaded. + + 0.13.9 (2012-08-25) + +++++++++++++++++++ + + - Fix for OAuth + POSTs + - Remove exception eating from dispatch_hook + - General bugfixes + + 0.13.8 (2012-08-21) + +++++++++++++++++++ + + - Incredible Link header support :) + + 0.13.7 (2012-08-19) + +++++++++++++++++++ + + - Support for (key, value) lists everywhere. + - Digest Authentication improvements. + - Ensure proxy exclusions work properly. + - Clearer UnicodeError exceptions. + - Automatic casting of URLs to strings (fURL and such) + - Bugfixes. + + 0.13.6 (2012-08-06) + +++++++++++++++++++ + + - Long awaited fix for hanging connections! + + 0.13.5 (2012-07-27) + +++++++++++++++++++ + + - Packaging fix + + 0.13.4 (2012-07-27) + +++++++++++++++++++ + + - GSSAPI/Kerberos authentication! + - App Engine 2.7 Fixes! + - Fix leaking connections (from urllib3 update) + - OAuthlib path hack fix + - OAuthlib URL parameters fix. + + 0.13.3 (2012-07-12) + +++++++++++++++++++ + + - Use simplejson if available. + - Do not hide SSLErrors behind Timeouts. + - Fixed param handling with urls containing fragments. + - Significantly improved information in User Agent. + - client certificates are ignored when verify=False + + 0.13.2 (2012-06-28) + +++++++++++++++++++ + + - Zero dependencies (once again)! + - New: Response.reason + - Sign querystring parameters in OAuth 1.0 + - Client certificates no longer ignored when verify=False + - Add openSUSE certificate support + + 0.13.1 (2012-06-07) + +++++++++++++++++++ + + - Allow passing a file or file-like object as data. + - Allow hooks to return responses that indicate errors. + - Fix Response.text and Response.json for body-less responses. + + 0.13.0 (2012-05-29) + +++++++++++++++++++ + + - Removal of Requests.async in favor of `grequests `_ + - Allow disabling of cookie persistence. + - New implementation of safe_mode + - cookies.get now supports default argument + - Session cookies not saved when Session.request is called with return_response=False + - Env: no_proxy support. + - RequestsCookieJar improvements. + - Various bug fixes. + + 0.12.1 (2012-05-08) + +++++++++++++++++++ + + - New ``Response.json`` property. + - Ability to add string file uploads. + - Fix out-of-range issue with iter_lines. + - Fix iter_content default size. + - Fix POST redirects containing files. + + 0.12.0 (2012-05-02) + +++++++++++++++++++ + + - EXPERIMENTAL OAUTH SUPPORT! + - Proper CookieJar-backed cookies interface with awesome dict-like interface. + - Speed fix for non-iterated content chunks. + - Move ``pre_request`` to a more usable place. + - New ``pre_send`` hook. + - Lazily encode data, params, files. + - Load system Certificate Bundle if ``certify`` isn't available. + - Cleanups, fixes. + + 0.11.2 (2012-04-22) + +++++++++++++++++++ + + - Attempt to use the OS's certificate bundle if ``certifi`` isn't available. + - Infinite digest auth redirect fix. + - Multi-part file upload improvements. + - Fix decoding of invalid %encodings in URLs. + - If there is no content in a response don't throw an error the second time that content is attempted to be read. + - Upload data on redirects. + + 0.11.1 (2012-03-30) + +++++++++++++++++++ + + * POST redirects now break RFC to do what browsers do: Follow up with a GET. + * New ``strict_mode`` configuration to disable new redirect behavior. + + + 0.11.0 (2012-03-14) + +++++++++++++++++++ + + * Private SSL Certificate support + * Remove select.poll from Gevent monkeypatching + * Remove redundant generator for chunked transfer encoding + * Fix: Response.ok raises Timeout Exception in safe_mode + + 0.10.8 (2012-03-09) + +++++++++++++++++++ + + * Generate chunked ValueError fix + * Proxy configuration by environment variables + * Simplification of iter_lines. + * New `trust_env` configuration for disabling system/environment hints. + * Suppress cookie errors. + + 0.10.7 (2012-03-07) + +++++++++++++++++++ + + * `encode_uri` = False + + 0.10.6 (2012-02-25) + +++++++++++++++++++ + + * Allow '=' in cookies. + + 0.10.5 (2012-02-25) + +++++++++++++++++++ + + * Response body with 0 content-length fix. + * New async.imap. + * Don't fail on netrc. + + + 0.10.4 (2012-02-20) + +++++++++++++++++++ + + * Honor netrc. + + 0.10.3 (2012-02-20) + +++++++++++++++++++ + + * HEAD requests don't follow redirects anymore. + * raise_for_status() doesn't raise for 3xx anymore. + * Make Session objects picklable. + * ValueError for invalid schema URLs. + + 0.10.2 (2012-01-15) + +++++++++++++++++++ + + * Vastly improved URL quoting. + * Additional allowed cookie key values. + * Attempted fix for "Too many open files" Error + * Replace unicode errors on first pass, no need for second pass. + * Append '/' to bare-domain urls before query insertion. + * Exceptions now inherit from RuntimeError. + * Binary uploads + auth fix. + * Bugfixes. + + + 0.10.1 (2012-01-23) + +++++++++++++++++++ + + * PYTHON 3 SUPPORT! + * Dropped 2.5 Support. (*Backwards Incompatible*) + + 0.10.0 (2012-01-21) + +++++++++++++++++++ + + * ``Response.content`` is now bytes-only. (*Backwards Incompatible*) + * New ``Response.text`` is unicode-only. + * If no ``Response.encoding`` is specified and ``chardet`` is available, ``Response.text`` will guess an encoding. + * Default to ISO-8859-1 (Western) encoding for "text" subtypes. + * Removal of `decode_unicode`. (*Backwards Incompatible*) + * New multiple-hooks system. + * New ``Response.register_hook`` for registering hooks within the pipeline. + * ``Response.url`` is now Unicode. + + 0.9.3 (2012-01-18) + ++++++++++++++++++ + + * SSL verify=False bugfix (apparent on windows machines). + + 0.9.2 (2012-01-18) + ++++++++++++++++++ + + * Asynchronous async.send method. + * Support for proper chunk streams with boundaries. + * session argument for Session classes. + * Print entire hook tracebacks, not just exception instance. + * Fix response.iter_lines from pending next line. + * Fix but in HTTP-digest auth w/ URI having query strings. + * Fix in Event Hooks section. + * Urllib3 update. + + + 0.9.1 (2012-01-06) + ++++++++++++++++++ + + * danger_mode for automatic Response.raise_for_status() + * Response.iter_lines refactor + + 0.9.0 (2011-12-28) + ++++++++++++++++++ + + * verify ssl is default. + + + 0.8.9 (2011-12-28) + ++++++++++++++++++ + + * Packaging fix. + + + 0.8.8 (2011-12-28) + ++++++++++++++++++ + + * SSL CERT VERIFICATION! + * Release of Cerifi: Mozilla's cert list. + * New 'verify' argument for SSL requests. + * Urllib3 update. + + 0.8.7 (2011-12-24) + ++++++++++++++++++ + + * iter_lines last-line truncation fix + * Force safe_mode for async requests + * Handle safe_mode exceptions more consistently + * Fix iteration on null responses in safe_mode + + 0.8.6 (2011-12-18) + ++++++++++++++++++ + + * Socket timeout fixes. + * Proxy Authorization support. + + 0.8.5 (2011-12-14) + ++++++++++++++++++ + + * Response.iter_lines! + + 0.8.4 (2011-12-11) + ++++++++++++++++++ + + * Prefetch bugfix. + * Added license to installed version. + + 0.8.3 (2011-11-27) + ++++++++++++++++++ + + * Converted auth system to use simpler callable objects. + * New session parameter to API methods. + * Display full URL while logging. + + 0.8.2 (2011-11-19) + ++++++++++++++++++ + + * New Unicode decoding system, based on over-ridable `Response.encoding`. + * Proper URL slash-quote handling. + * Cookies with ``[``, ``]``, and ``_`` allowed. + + 0.8.1 (2011-11-15) + ++++++++++++++++++ + + * URL Request path fix + * Proxy fix. + * Timeouts fix. + + 0.8.0 (2011-11-13) + ++++++++++++++++++ + + * Keep-alive support! + * Complete removal of Urllib2 + * Complete removal of Poster + * Complete removal of CookieJars + * New ConnectionError raising + * Safe_mode for error catching + * prefetch parameter for request methods + * OPTION method + * Async pool size throttling + * File uploads send real names + * Vendored in urllib3 + + 0.7.6 (2011-11-07) + ++++++++++++++++++ + + * Digest authentication bugfix (attach query data to path) + + 0.7.5 (2011-11-04) + ++++++++++++++++++ + + * Response.content = None if there was an invalid response. + * Redirection auth handling. + + 0.7.4 (2011-10-26) + ++++++++++++++++++ + + * Session Hooks fix. + + 0.7.3 (2011-10-23) + ++++++++++++++++++ + + * Digest Auth fix. + + + 0.7.2 (2011-10-23) + ++++++++++++++++++ + + * PATCH Fix. + + + 0.7.1 (2011-10-23) + ++++++++++++++++++ + + * Move away from urllib2 authentication handling. + * Fully Remove AuthManager, AuthObject, &c. + * New tuple-based auth system with handler callbacks. + + + 0.7.0 (2011-10-22) + ++++++++++++++++++ + + * Sessions are now the primary interface. + * Deprecated InvalidMethodException. + * PATCH fix. + * New config system (no more global settings). + + + 0.6.6 (2011-10-19) + ++++++++++++++++++ + + * Session parameter bugfix (params merging). + + + 0.6.5 (2011-10-18) + ++++++++++++++++++ + + * Offline (fast) test suite. + * Session dictionary argument merging. + + + 0.6.4 (2011-10-13) + ++++++++++++++++++ + + * Automatic decoding of unicode, based on HTTP Headers. + * New ``decode_unicode`` setting. + * Removal of ``r.read/close`` methods. + * New ``r.faw`` interface for advanced response usage.* + * Automatic expansion of parameterized headers. + + + 0.6.3 (2011-10-13) + ++++++++++++++++++ + + * Beautiful ``requests.async`` module, for making async requests w/ gevent. + + + 0.6.2 (2011-10-09) + ++++++++++++++++++ + + * GET/HEAD obeys allow_redirects=False. + + + 0.6.1 (2011-08-20) + ++++++++++++++++++ + + * Enhanced status codes experience ``\o/`` + * Set a maximum number of redirects (``settings.max_redirects``) + * Full Unicode URL support + * Support for protocol-less redirects. + * Allow for arbitrary request types. + * Bugfixes + + + 0.6.0 (2011-08-17) + ++++++++++++++++++ + + * New callback hook system + * New persistent sessions object and context manager + * Transparent Dict-cookie handling + * Status code reference object + * Removed Response.cached + * Added Response.request + * All args are kwargs + * Relative redirect support + * HTTPError handling improvements + * Improved https testing + * Bugfixes + + + 0.5.1 (2011-07-23) + ++++++++++++++++++ + + * International Domain Name Support! + * Access headers without fetching entire body (``read()``) + * Use lists as dicts for parameters + * Add Forced Basic Authentication + * Forced Basic is default authentication type + * ``python-requests.org`` default User-Agent header + * CaseInsensitiveDict lower-case caching + * Response.history bugfix + + + 0.5.0 (2011-06-21) + ++++++++++++++++++ + + * PATCH Support + * Support for Proxies + * HTTPBin Test Suite + * Redirect Fixes + * settings.verbose stream writing + * Querystrings for all methods + * URLErrors (Connection Refused, Timeout, Invalid URLs) are treated as explicitly raised + ``r.requests.get('hwe://blah'); r.raise_for_status()`` + + + 0.4.1 (2011-05-22) + ++++++++++++++++++ + + * Improved Redirection Handling + * New 'allow_redirects' param for following non-GET/HEAD Redirects + * Settings module refactoring + + + 0.4.0 (2011-05-15) + ++++++++++++++++++ + + * Response.history: list of redirected responses + * Case-Insensitive Header Dictionaries! + * Unicode URLs + + + 0.3.4 (2011-05-14) + ++++++++++++++++++ + + * Urllib2 HTTPAuthentication Recursion fix (Basic/Digest) + * Internal Refactor + * Bytes data upload Bugfix + + + + 0.3.3 (2011-05-12) + ++++++++++++++++++ + + * Request timeouts + * Unicode url-encoded data + * Settings context manager and module + + + 0.3.2 (2011-04-15) + ++++++++++++++++++ + + * Automatic Decompression of GZip Encoded Content + * AutoAuth Support for Tupled HTTP Auth + + + 0.3.1 (2011-04-01) + ++++++++++++++++++ + + * Cookie Changes + * Response.read() + * Poster fix + + + 0.3.0 (2011-02-25) + ++++++++++++++++++ + + * Automatic Authentication API Change + * Smarter Query URL Parameterization + * Allow file uploads and POST data together + * New Authentication Manager System + - Simpler Basic HTTP System + - Supports all build-in urllib2 Auths + - Allows for custom Auth Handlers + + + 0.2.4 (2011-02-19) + ++++++++++++++++++ + + * Python 2.5 Support + * PyPy-c v1.4 Support + * Auto-Authentication tests + * Improved Request object constructor + + 0.2.3 (2011-02-15) + ++++++++++++++++++ + + * New HTTPHandling Methods + - Response.__nonzero__ (false if bad HTTP Status) + - Response.ok (True if expected HTTP Status) + - Response.error (Logged HTTPError if bad HTTP Status) + - Response.raise_for_status() (Raises stored HTTPError) + + + 0.2.2 (2011-02-14) + ++++++++++++++++++ + + * Still handles request in the event of an HTTPError. (Issue #2) + * Eventlet and Gevent Monkeypatch support. + * Cookie Support (Issue #1) + + + 0.2.1 (2011-02-14) + ++++++++++++++++++ + + * Added file attribute to POST and PUT requests for multipart-encode file uploads. + * Added Request.url attribute for context and redirects + + + 0.2.0 (2011-02-14) + ++++++++++++++++++ + + * Birth! + + + 0.0.1 (2011-02-13) + ++++++++++++++++++ + + * Frustration + * Conception + +Platform: UNKNOWN +Classifier: Development Status :: 5 - Production/Stable +Classifier: Intended Audience :: Developers +Classifier: Natural Language :: English +Classifier: License :: OSI Approved :: Apache Software License +Classifier: Programming Language :: Python +Classifier: Programming Language :: Python :: 2.6 +Classifier: Programming Language :: Python :: 2.7 +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.4 +Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: Implementation :: CPython +Classifier: Programming Language :: Python :: Implementation :: PyPy +Provides-Extra: socks +Provides-Extra: security diff --git a/tests/fixtures/crunchy_frog-0.2.egg-info/SOURCES.txt b/tests/fixtures/crunchy_frog-0.2.egg-info/SOURCES.txt new file mode 100644 index 0000000..ef14632 --- /dev/null +++ b/tests/fixtures/crunchy_frog-0.2.egg-info/SOURCES.txt @@ -0,0 +1,46 @@ +HISTORY.rst +LICENSE +MANIFEST.in +README.rst +pytest.ini +requirements.txt +setup.cfg +setup.py +requests/__init__.py +requests/__version__.py +requests/_internal_utils.py +requests/adapters.py +requests/api.py +requests/auth.py +requests/certs.py +requests/compat.py +requests/cookies.py +requests/exceptions.py +requests/help.py +requests/hooks.py +requests/models.py +requests/packages.py +requests/sessions.py +requests/status_codes.py +requests/structures.py +requests/utils.py +requests.egg-info/PKG-INFO +requests.egg-info/SOURCES.txt +requests.egg-info/dependency_links.txt +requests.egg-info/not-zip-safe +requests.egg-info/requires.txt +requests.egg-info/top_level.txt +tests/__init__.py +tests/compat.py +tests/conftest.py +tests/test_help.py +tests/test_hooks.py +tests/test_lowlevel.py +tests/test_packages.py +tests/test_requests.py +tests/test_structures.py +tests/test_testserver.py +tests/test_utils.py +tests/utils.py +tests/testserver/__init__.py +tests/testserver/server.py \ No newline at end of file diff --git a/tests/fixtures/crunchy_frog-0.2.egg-info/dependency_links.txt b/tests/fixtures/crunchy_frog-0.2.egg-info/dependency_links.txt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/tests/fixtures/crunchy_frog-0.2.egg-info/dependency_links.txt @@ -0,0 +1 @@ + diff --git a/tests/fixtures/crunchy_frog-0.2.egg-info/installed-files.txt b/tests/fixtures/crunchy_frog-0.2.egg-info/installed-files.txt new file mode 100644 index 0000000..53189bc --- /dev/null +++ b/tests/fixtures/crunchy_frog-0.2.egg-info/installed-files.txt @@ -0,0 +1,42 @@ +../requests/__init__.py +../requests/__pycache__/__init__.cpython-36.pyc +../requests/__pycache__/__version__.cpython-36.pyc +../requests/__pycache__/_internal_utils.cpython-36.pyc +../requests/__pycache__/adapters.cpython-36.pyc +../requests/__pycache__/api.cpython-36.pyc +../requests/__pycache__/auth.cpython-36.pyc +../requests/__pycache__/certs.cpython-36.pyc +../requests/__pycache__/compat.cpython-36.pyc +../requests/__pycache__/cookies.cpython-36.pyc +../requests/__pycache__/exceptions.cpython-36.pyc +../requests/__pycache__/help.cpython-36.pyc +../requests/__pycache__/hooks.cpython-36.pyc +../requests/__pycache__/models.cpython-36.pyc +../requests/__pycache__/packages.cpython-36.pyc +../requests/__pycache__/sessions.cpython-36.pyc +../requests/__pycache__/status_codes.cpython-36.pyc +../requests/__pycache__/structures.cpython-36.pyc +../requests/__pycache__/utils.cpython-36.pyc +../requests/__version__.py +../requests/_internal_utils.py +../requests/adapters.py +../requests/api.py +../requests/auth.py +../requests/certs.py +../requests/compat.py +../requests/cookies.py +../requests/exceptions.py +../requests/help.py +../requests/hooks.py +../requests/models.py +../requests/packages.py +../requests/sessions.py +../requests/status_codes.py +../requests/structures.py +../requests/utils.py +PKG-INFO +SOURCES.txt +dependency_links.txt +not-zip-safe +requires.txt +top_level.txt diff --git a/tests/fixtures/crunchy_frog-0.2.egg-info/not-zip-safe b/tests/fixtures/crunchy_frog-0.2.egg-info/not-zip-safe new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/tests/fixtures/crunchy_frog-0.2.egg-info/not-zip-safe @@ -0,0 +1 @@ + diff --git a/tests/fixtures/crunchy_frog-0.2.egg-info/requires.txt b/tests/fixtures/crunchy_frog-0.2.egg-info/requires.txt new file mode 100644 index 0000000..6dbca83 --- /dev/null +++ b/tests/fixtures/crunchy_frog-0.2.egg-info/requires.txt @@ -0,0 +1,15 @@ +chardet<3.1.0,>=3.0.2 +idna<2.7,>=2.5 +urllib3<1.23,>=1.21.1 +certifi>=2017.4.17 + +[security] +pyOpenSSL>=0.14 +cryptography>=1.3.4 +idna>=2.0.0 + +[socks] +PySocks!=1.5.7,>=1.5.6 + +[socks:sys_platform == "win32" and (python_version == "2.7" or python_version == "2.6")] +win_inet_pton diff --git a/tests/fixtures/crunchy_frog-0.2.egg-info/top_level.txt b/tests/fixtures/crunchy_frog-0.2.egg-info/top_level.txt new file mode 100644 index 0000000..f229360 --- /dev/null +++ b/tests/fixtures/crunchy_frog-0.2.egg-info/top_level.txt @@ -0,0 +1 @@ +requests diff --git a/tests/test_thanks.py b/tests/test_thanks.py index 736d2f3..6d42626 100644 --- a/tests/test_thanks.py +++ b/tests/test_thanks.py @@ -3,11 +3,18 @@ """Tests for `thanks` package.""" - +import os +import sys +from textwrap import dedent import unittest from click.testing import CliRunner -from thanks import cli +from thanks import cli, Thanks + +# Add the mock packages in test/fixtures to sys.path +package_fixture_paths = os.path.join(os.path.dirname( + os.path.realpath(__file__)), 'fixtures') +sys.path.append(package_fixture_paths) class TestThanks(unittest.TestCase): @@ -19,12 +26,59 @@ def setUp(self): def tearDown(self): """Tear down test fixtures, if any.""" - def test_000_something(self): - """Test something.""" - def test_command_line_interface(self): """Test the CLI.""" runner = CliRunner() help_result = runner.invoke(cli.main, ['--help']) assert help_result.exit_code == 0 assert 'Show this message and exit.' in help_result.output + + def test_thanks_package(self): + thanks = Thanks() + + thanks.package("crunchy-frog") + + output = thanks.__str__(colored_output=False) + + assert "You depend on 1 authors" in output + assert "crunchy-frog Kenneth Reitz" in output + + def test_thanks_requirements_list(self): + thanks = Thanks() + + thanks.requirements_list(dedent(""" + crunchy-frog + mosw + """)) + + output = thanks.__str__(colored_output=False) + + assert "You depend on 2 authors" in output + assert "crunchy-frog Kenneth Reitz" in output + assert "mosw http://ministry-of-silly-walks.python/fundme Tom Marks" in output + + def test_thanks_pipfile(self): + pipfile_contents = dedent(""" + [[source]] + url = "https://pypi.python.org/simple" + verify_ssl = true + name = "pypi" + + [packages] + crunchy-frog = "==0.2" + + [dev-packages] + mosw = "*" + + [requires] + python_version = "3.6" + """) + thanks = Thanks() + + thanks.pipfile(pipfile_contents) + + output = thanks.__str__(colored_output=False) + + assert "You depend on 2 authors" in output + assert "crunchy-frog Kenneth Reitz" in output + assert "mosw http://ministry-of-silly-walks.python/fundme Tom Marks" in output diff --git a/thanks/__init__.py b/thanks/__init__.py index 598032b..db6a59c 100644 --- a/thanks/__init__.py +++ b/thanks/__init__.py @@ -1,7 +1,11 @@ # -*- coding: utf-8 -*- +from .thanks import Thanks + """Top-level package for Thanks.""" __author__ = """Philip James""" __email__ = 'phildini@phildini.net' __version__ = '0.0.8' + +__all__ = ["Thanks"] diff --git a/thanks/cli.py b/thanks/cli.py index 2e5afce..c3486fd 100644 --- a/thanks/cli.py +++ b/thanks/cli.py @@ -1,20 +1,43 @@ # -*- coding: utf-8 -*- """Console script for thanks.""" +from __future__ import absolute_import + +import logging import click -from .thanks import Thanks +from thanks.thanks import Thanks + +logging.basicConfig(level=logging.CRITICAL) +logger = logging.getLogger("thanks") @click.command() -@click.argument('requirements', default='requirements.txt', type=click.Path(exists=True)) -@click.option('--debug', is_flag=True, help='Set debug mode') -def main(requirements, debug): - """Console script for thanks.""" - with open(requirements, 'r') as fh: - requirements = fh.read().strip().split() - Thanks(debug=debug).find_project_details(requirements) - return 0 +@click.argument("package_name", + nargs=-1) +@click.option("--requirements", "-r", + multiple=True, + type=click.File("r")) +@click.option("--pipfile", "-p", + multiple=True, + type=click.File("r")) +@click.option("--debug/--no-debug", default=False, help='Set debug mode') +@click.option("--outfile", "-o", + type=click.File("w"), + default="-", help='Save output to file') +def main(package_name, requirements, pipfile, # setuppy, + debug, outfile): + if debug: + logger.level = logging.DEBUG + thanks = Thanks(debug=debug) + for p in package_name: + thanks.package(p) + for r in requirements: + thanks.requirements_list(r.read()) + for p in pipfile: + thanks.pipfile(p.read()) + + outfile.write(str(thanks)) if __name__ == "__main__": diff --git a/thanks/thanks.py b/thanks/thanks.py index e33b240..3fcc950 100644 --- a/thanks/thanks.py +++ b/thanks/thanks.py @@ -1,16 +1,22 @@ # -*- coding: utf-8 -*- +from __future__ import print_function from collections import namedtuple from humanfriendly.tables import format_pretty_table import json +import logging import os import requirements import requests -from termcolor import colored, cprint +import termcolor +import toml +from termcolor import colored from . import package_tools +logger = logging.getLogger("thanks") + JSON_FILE = ("{}/thanks.json".format(os.path.dirname(os.path.realpath(__file__)))) ProjectData = namedtuple('ProjectData', ['name', 'funding_link', 'authors']) @@ -21,57 +27,43 @@ def __init__(self, debug=False): self.debug = debug self.give_thanks_to = {} - def find_project_details(self, requirements_list): + def package(self, package_name): + logger.debug("Checking {}".format(package_name)) + package_data = (self._get_local_data(package_name) + or self._get_remote_data(package_name)) + if package_data: + self.give_thanks_to[package_name] = package_data + + def requirements_list(self, requirements_list): print('Scanning your {} file...'.format(colored('requirements', 'red'))) reqs = [ next(requirements.parse(r)) - for r in requirements_list + for r in requirements_list.splitlines() + if r != "" ] for req in reqs: - self.update_give_thanks(req.name) - self._display_thanks() - - def _display_thanks(self): - if self.give_thanks_to: - cprint( - 'You depend on {} who would {}'.format( - colored('{} authors'.format(len(self.give_thanks_to)), 'cyan'), - colored('enjoy donations!', 'green'), - ), attrs=['bold']) - colorized_data = [ - ProjectData( - name=colored(pd.name, 'cyan'), - funding_link=colored(pd.funding_link, 'green'), - authors=colored(pd.authors, 'yellow'), - ) - for pd in self.give_thanks_to.values() - ] - - print(format_pretty_table( - data=colorized_data, - column_names=['Project', 'Where to thank', 'Authors'], - horizontal_bar=' ', - vertical_bar=' ', - )) - cprint( - ''.join([ - "If you see projects with ", - colored("MISSING FUNDING INFORMATION ", "red"), - "then why not submit a pull request ", - "the project repository asking the author to ", - colored("ADD A 'FUNDING' PROJECT_URL ", "yellow"), - "to the projects setup.py" - ]), - attrs=['bold'] - ) + self.package(req.name) + + def pipfile(self, pipfile): + project_data = toml.loads(pipfile) + reqs = [] + reqs += list(project_data.get("packages", {}).keys()) + reqs += list(project_data.get("dev-packages", {}).keys()) + for req in reqs: + self.package(req) - def get_local_data(self, project_name): + def _get_local_data(self, project_name): try: metadata = package_tools.get_local_metadata(project_name) + funding_link = metadata.get('funding_url', '') + authors = metadata.get('author', '') + if not any([funding_link, authors]): + return None + data = ProjectData( name=project_name, - funding_link=metadata['funding_url'], - authors=metadata['author'] + funding_link=funding_link, + authors=authors, ) except KeyError: data = None @@ -79,7 +71,7 @@ def get_local_data(self, project_name): data = None return data - def get_remote_data(self, project_name): + def _get_remote_data(self, project_name): url_format = 'https://pypi.org/pypi/{}/json'.format try: resp = requests.get(url_format(project_name)) @@ -95,9 +87,51 @@ def get_remote_data(self, project_name): data = None return data - def update_give_thanks(self, package_name): - if self.debug: - print('Checking ', package_name) - package_data = self.get_local_data(package_name) or self.get_remote_data(package_name) - if package_data: - self.give_thanks_to[package_name] = package_data + def _generate_output(self, colored_output=True): + def _uncolored(text, *args, **kwargs): + return text + + colored = termcolor.colored if colored_output else _uncolored + + lines = [] + lines.append( + colored('You depend on {} who would {}'.format( + colored('{} authors'.format(len(self.give_thanks_to)), 'cyan'), + colored('enjoy donations!', 'green'), + ), + attrs=['bold'] + ) + ) + + colorized_data = [ + ProjectData( + name=colored(pd.name, 'cyan'), + funding_link=colored(pd.funding_link, 'green'), + authors=colored(pd.authors, 'yellow'), + ) + for pd in self.give_thanks_to.values() + ] + + lines.append(format_pretty_table( + data=colorized_data, + column_names=['Project', 'Where to thank', 'Authors'], + horizontal_bar=' ', + vertical_bar=' ', + )) + + lines.append(colored( + ''.join([ + "If you see projects with ", + colored("MISSING FUNDING INFORMATION ", "red"), + "then why not submit a pull request ", + "the project repository asking the author to ", + colored("ADD A 'FUNDING' PROJECT_URL ", "yellow"), + "to the projects setup.py" + ]), + attrs=['bold'] + )) + + return '\n'.join(lines) + + def __str__(self, colored_output=True): + return self._generate_output(colored_output) diff --git a/tox.ini b/tox.ini index 5ce316e..9f32085 100644 --- a/tox.ini +++ b/tox.ini @@ -14,8 +14,9 @@ deps = flake8 commands = flake8 thanks [testenv] +whitelist_externals= + py.test setenv = PYTHONPATH = {toxinidir} -commands = python setup.py nosetests - +commands = python setup.py test