Merge pull request #991 from lyndsysimon/master

Changes license from ISC to Apache2

README.rst

@@ -5,7 +5,7 @@ Requests: HTTP for Humans
 .. image:: https://secure.travis-ci.org/kennethreitz/requests.png?branch=develop
         :target: https://secure.travis-ci.org/kennethreitz/requests
 
-Requests is an ISC Licensed HTTP library, written in Python, for human
+Requests is an Apache2 Licensed HTTP library, written in Python, for human
 beings.
 
 Most existing Python modules for sending HTTP requests are extremely

docs/index.rst

@@ -8,7 +8,7 @@ Requests: HTTP for Humans
 
 Release v\ |version|. (:ref:`Installation <install>`)
 
-Requests is an :ref:`ISC Licensed <isc>` HTTP library, written in Python, for human beings.
+Requests is an :ref:`Apache2 Licensed <apache2>` HTTP library, written in Python, for human beings.
 
 Python's standard **urllib2** module provides most of
 the HTTP capabilities you need, but the API is thoroughly **broken**.

docs/user/intro.rst

@@ -17,9 +17,9 @@ Requests was developed with a few :pep:`20` idioms in mind.
 
 All contributions to Requests should keep these important rules in mind.
 
-.. _`isc`:
+.. _`apache2`:
 
-ISC License
+Apache2 License
 -----------
 
 A large number of open source projects you find today are `GPL Licensed`_.
@@ -33,10 +33,10 @@ The MIT, BSD, ISC, and Apache2 licenses are great alternatives to the GPL
 that allow your open-source software to be used freely in proprietary,
 closed-source software.
 
-Requests is released under terms of `The ISC License`_.
+Requests is released under terms of `Apache2 License`_.
 
 .. _`GPL Licensed`: http://www.opensource.org/licenses/gpl-license.php
-.. _`The ISC License`: http://www.opensource.org/licenses/isc-license
+.. _`Apache2 License`: http://opensource.org/licenses/Apache-2.0
 
 
 Requests License

requests/__init__.py

@@ -37,7 +37,7 @@ The other HTTP methods are supported - see `requests.api`. Full documentation
 is at <http://python-requests.org>.
 
 :copyright: (c) 2012 by Kenneth Reitz.
-:license: ISC, see LICENSE for more details.
+:license: Apache 2.0, see LICENSE for more details.
 
 """
 
@@ -45,7 +45,7 @@ __title__ = 'requests'
 __version__ = '0.14.2'
 __build__ = 0x001402
 __author__ = 'Kenneth Reitz'
-__license__ = 'ISC'
+__license__ = 'Apache 2.0'
 __copyright__ = 'Copyright 2012 Kenneth Reitz'
 
 

requests/api.py

@@ -7,7 +7,7 @@ requests.api
 This module implements the Requests API.
 
 :copyright: (c) 2012 by Kenneth Reitz.
-:license: ISC, see LICENSE for more details.
+:license: Apache2, see LICENSE for more details.
 
 """
 

setup.py

@@ -45,7 +45,7 @@ setup(
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
         'Natural Language :: English',
-        'License :: OSI Approved :: ISC License (ISCL)',
+        'License :: OSI Approved :: Apache Software License',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',