Author ned.deily
Recipients benjamin.peterson, georg.brandl, larry, ned.deily
Date 2014-05-24.23:02:14
SpamBayes Score -1.0
Marked as misclassified Yes
Message-id <1400972536.12.0.296163327906.issue21572@psf.upfronthosting.co.za>
In-reply-to
Content
Currently the "license" command for the interactive interpreter falls back to attempting to download a release-specific license URL if LICENSE.txt is not found locally.  This adds the requirement to the release process to create a release-specific license file for each release.  However, as was implemented in Issue19043, we now use a generic license page in the documentation that no longer needs to be updated for each release (http://www.python.org/psf/license/ -> https://docs.python.org/2/license.html).  Suggest changing Lib/site.py to use the generic URL as the fallback, thus eliminating the need to create a redundant downloads license page for each release.


For 2.7:
diff --git a/Lib/site.py b/Lib/site.py
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -436,7 +436,7 @@
     for supporting Python development.  See www.python.org for more information.""")
     here = os.path.dirname(os.__file__)
     __builtin__.license = _Printer(
-        "license", "See http://www.python.org/%.3s/license.html" % sys.version,
+        "license", "See http://www.python.org/psf/license/",
         ["LICENSE.txt", "LICENSE"],
         [os.path.join(here, os.pardir), here, os.curdir])

For 3.x:
diff --git a/Lib/site.py b/Lib/site.py
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -373,7 +373,7 @@
         dirs.extend([os.path.join(here, os.pardir), here, os.curdir])
     builtins.license = _sitebuiltins._Printer(
         "license",
-        "See http://www.python.org/download/releases/%.5s/license" % sys.version,
+        "See http://www.python.org/psf/license/",
         files, dirs)

For PEP 101:
diff --git a/pep-0101.txt b/pep-0101.txt
--- a/pep-0101.txt
+++ b/pep-0101.txt
@@ -487,8 +487,6 @@
       ___ Comment out the "This is a preview release" or the "This is a
           production release" paragraph as appropriate

-      ___ Update the license in `download/releases/X.Y.Z/license`
-
       Note, you don't have to copy any release files into this directory;
       they only live on dinsdale in the ftp directory.
History
Date User Action Args
2014-05-24 23:02:16ned.deilysetrecipients: + ned.deily, georg.brandl, larry, benjamin.peterson
2014-05-24 23:02:16ned.deilysetmessageid: <1400972536.12.0.296163327906.issue21572@psf.upfronthosting.co.za>
2014-05-24 23:02:15ned.deilylinkissue21572 messages
2014-05-24 23:02:14ned.deilycreate