浏览代码

Moved and updated Python license.

Tim Graham 9 年之前
父节点
当前提交
17e2edf113
共有 3 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      LICENSE.python
  2. 1 0
      MANIFEST.in
  3. 1 2
      django/dispatch/weakref_backports.py

+ 2 - 2
django/dispatch/license.python.txt → 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,
 distribute, and otherwise use Python alone or in any derivative version,
 provided, however, that PSF's License Agreement and PSF's notice of copyright,
 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,
 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
 3. In the event Licensee prepares a derivative work that is based on
 or incorporates Python or any part thereof, and wants to make
 or incorporates Python or any part thereof, and wants to make

+ 1 - 0
MANIFEST.in

@@ -2,6 +2,7 @@ include AUTHORS
 include Gruntfile.js
 include Gruntfile.js
 include INSTALL
 include INSTALL
 include LICENSE
 include LICENSE
+include LICENSE.python
 include MANIFEST.in
 include MANIFEST.in
 include package.json
 include package.json
 include *.rst
 include *.rst

+ 1 - 2
django/dispatch/weakref_backports.py

@@ -2,8 +2,7 @@
 weakref_backports is a partial backport of the weakref module for python
 weakref_backports is a partial backport of the weakref module for python
 versions below 3.4.
 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:
 The following changes were made to the original sources during backporting: