Issue #19936: Added executable bits or shebang lines to Python scripts which

requires them.  Disable executable bits and shebang lines in test and
benchmark files in order to prevent using a random system python, and in
source files of modules which don't provide command line interface.  Fixed
shebang lines in the unittestgui and checkpip scripts.

Lib/difflib.py

@@ -1,5 +1,3 @@
-#! /usr/bin/env python3
-
 """
 Module difflib -- helpers for computing deltas between objects.
 

Lib/http/cookies.py

@@ -1,6 +1,3 @@
-#!/usr/bin/env python3
-#
-
 ####
 # Copyright 2000 by Timothy O'Malley <timo@alum.mit.edu>
 #

Lib/mailbox.py

@@ -1,5 +1,3 @@
-#! /usr/bin/env python3
-
 """Read/write support for Maildir, mbox, MH, Babyl, and MMDF mailboxes."""
 
 # Notes for authors of new mailbox subclasses:

Lib/operator.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 """
 Operator Interface
 

Lib/test/_test_multiprocessing.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 #
 # Unit tests for the multiprocessing package
 #

Lib/test/multibytecodec_support.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 #
 # multibytecodec_support.py
 #   Common Unittest Routines for CJK codecs

Lib/test/test___future__.py

@@ -1,4 +1,3 @@
-#! /usr/bin/env python3
 import unittest
 from test import support
 import __future__

Lib/test/test_array.py

@@ -1,4 +1,3 @@
-#! /usr/bin/env python3
 """Test the arraymodule.
    Roger E. Masse
 """

Lib/test/test_binhex.py

@@ -1,4 +1,3 @@
-#! /usr/bin/env python3
 """Test script for the binhex C module
 
    Uses the mechanism of the python binhex module

Lib/test/test_bz2.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 from test import support
 from test.support import bigmemtest, _4G
 

Lib/test/test_cmd.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 """
 Test script for the 'cmd' module
 Original by Michael Schneider

Lib/test/test_codecencodings_cn.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 #
 # test_codecencodings_cn.py
 #   Codec encoding tests for PRC encodings.

Lib/test/test_codecencodings_hk.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 #
 # test_codecencodings_hk.py
 #   Codec encoding tests for HongKong encodings.

Lib/test/test_codecencodings_iso2022.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-#
 # Codec encoding tests for ISO 2022 encodings.
 
 from test import support

Lib/test/test_codecencodings_jp.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 #
 # test_codecencodings_jp.py
 #   Codec encoding tests for Japanese encodings.

Lib/test/test_codecencodings_kr.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 #
 # test_codecencodings_kr.py
 #   Codec encoding tests for ROK encodings.

Lib/test/test_codecencodings_tw.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 #
 # test_codecencodings_tw.py
 #   Codec encoding tests for ROC encodings.

Lib/test/test_codecmaps_cn.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 #
 # test_codecmaps_cn.py
 #   Codec mapping tests for PRC encodings

Lib/test/test_codecmaps_hk.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 #
 # test_codecmaps_hk.py
 #   Codec mapping tests for HongKong encodings

Lib/test/test_codecmaps_jp.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 #
 # test_codecmaps_jp.py
 #   Codec mapping tests for Japanese encodings

Lib/test/test_codecmaps_kr.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 #
 # test_codecmaps_kr.py
 #   Codec mapping tests for ROK encodings

Lib/test/test_codecmaps_tw.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 #
 # test_codecmaps_tw.py
 #   Codec mapping tests for ROC encodings

Lib/test/test_dbm.py

@@ -1,4 +1,3 @@
-#! /usr/bin/env python3
 """Test script for the dbm.open function based on testdumbdbm.py"""
 
 import os

Lib/test/test_dbm_dumb.py

@@ -1,4 +1,3 @@
-#! /usr/bin/env python3
 """Test script for the dumbdbm module
    Original by Roger E. Masse
 """

Lib/test/test_eof.py

@@ -1,4 +1,3 @@
-#! /usr/bin/env python3
 """test script for a few new invalid token catches"""
 
 import unittest

Lib/test/test_errno.py

@@ -1,4 +1,3 @@
-#! /usr/bin/env python3
 """Test the errno module
    Roger E. Masse
 """

Lib/test/test_gzip.py

@@ -1,4 +1,3 @@
-#! /usr/bin/env python3
 """Test script for the gzip module.
 """
 

Lib/test/test_keywordonlyarg.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 """Unit tests for the keyword only argument specified in PEP 3102."""
 
 __author__ = "Jiwon Seo"

Lib/test/test_logging.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-#
 # Copyright 2001-2013 by Vinay Sajip. All Rights Reserved.
 #
 # Permission to use, copy, modify, and distribute this software and its

Lib/test/test_marshal.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 from test import support
 import array
 import io

Lib/test/test_multibytecodec.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 #
 # test_multibytecodec.py
 #   Unit test for multibytecodec itself

Lib/test/test_popen.py

@@ -1,4 +1,3 @@
-#! /usr/bin/env python3
 """Basic tests for os.popen()
 
   Particularly useful for platforms that fake popen.

Lib/test/test_random.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 import unittest
 import unittest.mock
 import random

Lib/test/test_sched.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import queue
 import sched
 import time

Lib/test/test_smtpnet.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 import unittest
 from test import support
 import smtplib

Lib/test/test_socket.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 import unittest
 from test import support
 

Lib/test/test_support.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 import importlib
 import shutil
 import sys

Lib/test/test_tcl.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 import unittest
 import sys
 import os

Lib/test/test_urllib2_localnet.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 import os
 import email
 import urllib.parse

Lib/test/test_urllib2net.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 import unittest
 from test import support
 from test.test_urllib2 import sanepathname2url

Lib/test/test_urllibnet.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 import unittest
 from test import support
 

Lib/test/test_urlparse.py

@@ -1,5 +1,3 @@
-#! /usr/bin/env python3
-
 from test import support
 import unittest
 import urllib.parse

Lib/test/test_userstring.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # UserString is a wrapper around the native builtin string type.
 # UserString instances should behave similar to builtin string objects.
 

Lib/test/test_with.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 """Unit tests for the with statement specified in PEP 343."""
 
 

Lib/test/test_xmlrpc_net.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 import collections.abc
 import errno
 import socket

Misc/NEWS

@@ -88,6 +88,12 @@ Tests
 Tools/Demos
 -----------
 
+- Issue #19936: Added executable bits or shebang lines to Python scripts which
+  requires them.  Disable executable bits and shebang lines in test and
+  benchmark files in order to prevent using a random system python, and in
+  source files of modules which don't provide command line interface.  Fixed
+  shebang lines in the unittestgui and checkpip scripts.
+
 - Issue #20268: Argument Clinic now supports cloning the parameters and
   return converter of existing functions.
 

Tools/clinic/clinic_test.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-#
 # Argument Clinic
 # Copyright 2012-2013 by Larry Hastings.
 # Licensed to the PSF under a contributor agreement.

Tools/scripts/checkpip.py

@@ -1,4 +1,4 @@
-#/usr/bin/env python3
+#!/usr/bin/env python3
 """
 Checks that the version of the projects bundled in ensurepip are the latest
 versions available.

Tools/unittestgui/unittestgui.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 GUI framework and application for use with Python unit testing framework.
 Execute tests written using the framework provided by the 'unittest' module.