Skip to content
This repository was archived by the owner on Apr 14, 2022. It is now read-only.

Commit 035da14

Browse files
committed
Apply changes from review comments
1 parent 3e5cbdd commit 035da14

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

LICENSE

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
11
This software is made available under the terms of *either* of the
22
licenses found in LICENSE.APACHE2 or LICENSE.MIT. Contributions to
33
Hip are made under the terms of *both* these licenses.
4+
5+
This software contains work from the urllib3 project, used under the following license:
6+
7+
MIT License
8+
9+
Copyright (c) 2008-2019 Andrey Petrov and contributors (see CONTRIBUTORS.txt)
10+
11+
Permission is hereby granted, free of charge, to any person obtaining a copy
12+
of this software and associated documentation files (the "Software"), to deal
13+
in the Software without restriction, including without limitation the rights
14+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
15+
copies of the Software, and to permit persons to whom the Software is
16+
furnished to do so, subject to the following conditions:
17+
18+
The above copyright notice and this permission notice shall be included in all
19+
copies or substantial portions of the Software.
20+
21+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
22+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
23+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
24+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
25+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
26+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
27+
SOFTWARE.

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description = Hip: A new Python HTTP client for Everyone
44
long_description = file: README.rst, CHANGES.rst
55
keywords = http client
66
license = MIT -or- Apache-2.0
7-
author = Nathaniel J. Smith
7+
author = The Trio Collective
88
author_email = [email protected]
99
url = https://hip.readthedocs.io
1010
project_urls =

0 commit comments

Comments
 (0)