From 17e2edf113f3d1590b66b1c7107ef513eb5a35c3 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Sat, 26 Sep 2015 20:48:20 -0400 Subject: [PATCH] Moved and updated Python license. --- django/dispatch/license.python.txt => LICENSE.python | 4 ++-- MANIFEST.in | 1 + django/dispatch/weakref_backports.py | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) rename django/dispatch/license.python.txt => LICENSE.python (98%) diff --git a/django/dispatch/license.python.txt b/LICENSE.python similarity index 98% rename from django/dispatch/license.python.txt rename to LICENSE.python index f9ca2c987c..88251f5b6e 100644 --- a/django/dispatch/license.python.txt +++ b/LICENSE.python @@ -74,8 +74,8 @@ analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -2011, 2012, 2013, 2014 Python Software Foundation; All Rights Reserved" are retained -in Python alone or in any derivative version prepared by Licensee. +2011, 2012, 2013, 2014, 2015 Python Software Foundation; All Rights Reserved" +are retained in Python alone or in any derivative version prepared by Licensee. 3. In the event Licensee prepares a derivative work that is based on or incorporates Python or any part thereof, and wants to make diff --git a/MANIFEST.in b/MANIFEST.in index 9e7d133a5e..faf38a00b9 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,6 +2,7 @@ include AUTHORS include Gruntfile.js include INSTALL include LICENSE +include LICENSE.python include MANIFEST.in include package.json include *.rst diff --git a/django/dispatch/weakref_backports.py b/django/dispatch/weakref_backports.py index edc86936de..736f7e1ab8 100644 --- a/django/dispatch/weakref_backports.py +++ b/django/dispatch/weakref_backports.py @@ -2,8 +2,7 @@ weakref_backports is a partial backport of the weakref module for python versions below 3.4. -Copyright (C) 2013 Python Software Foundation, see license.python.txt for -details. +Copyright (C) 2013 Python Software Foundation, see LICENSE.python for details. The following changes were made to the original sources during backporting: