Update distutils so that it triggers no warnings when run under -3. · pylee/python@3c2cfcf · GitHub

pylee / python Public

forked from glix/python

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 1

• Code
• Pull requests
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit 3c2cfcf

Browse filesBrowse the repository at this point in the historyBrowse files

brett.cannon

committed

Update distutils so that it triggers no warnings when run under -3.

git-svn-id: http://svn.python.org/projects/python/trunk@65742 6015fed2-1504-0410-9fe1-9d1591cc4771

1 parent 84d9781 commit 3c2cfcf
Copy full SHA for 3c2cfcf

4 files changed

+10-9Lines changed: 10 additions & 9 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Lib/distutils
  • command
    • build_ext.py
    • build_py.py
  • core.py
• Misc
  • NEWS

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Lib/distutils/command/build_ext.py‎

Copy file name to clipboardExpand all lines: Lib/distutils/command/build_ext.py

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -679,7 +679,7 @@ def get_ext_filename (self, ext_name):
679	679	so_ext = get_config_var('SO')
680	680	if os.name == 'nt' and self.debug:
681	681	return apply(os.path.join, ext_path) + '_d' + so_ext
682		- return apply(os.path.join, ext_path) + so_ext
	682	+ return os.path.join(*ext_path) + so_ext
683	683
684	684	def get_export_symbols (self, ext):
685	685	"""Return the list of symbols that a shared extension has to

Collapse file

‎Lib/distutils/command/build_py.py‎

Copy file name to clipboardExpand all lines: Lib/distutils/command/build_py.py

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -169,7 +169,7 @@ def get_package_dir (self, package):
169	169	del path[-1]
170	170	else:
171	171	tail.insert(0, pdir)
172		- return apply(os.path.join, tail)
	172	+ return os.path.join(*tail)
173	173	else:
174	174	# Oops, got all the way through 'path' without finding a
175	175	# match in package_dir. If package_dir defines a directory
@@ -337,7 +337,7 @@ def get_source_files (self):
337	337
338	338	def get_module_outfile (self, build_dir, package, module):
339	339	outfile_path = [build_dir] + list(package) + [module + ".py"]
340		- return apply(os.path.join, outfile_path)
	340	+ return os.path.join(*outfile_path)
341	341
342	342
343	343	def get_outputs (self, include_bytecode=1):

Collapse file

‎Lib/distutils/core.py‎

Copy file name to clipboardExpand all lines: Lib/distutils/core.py

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -218,7 +218,8 @@ def run_setup (script_name, script_args=None, stop_after="run"):
218	218	sys.argv[0] = script_name
219	219	if script_args is not None:
220	220	sys.argv[1:] = script_args
221		- execfile(script_name, g, l)
	221	+ with open(script_name, 'r') as file:
	222	+ exec file.read() in g, l
222	223	finally:
223	224	sys.argv = save_argv
224	225	_setup_stop_after = None

Collapse file

‎Misc/NEWS‎

Copy file name to clipboardExpand all lines: Misc/NEWS

+5-5Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
@@ -92,11 +92,11 @@ Library
92	92
93	93	- Changed code in the following modules/packages to remove warnings raised
94	94	while running under the ``-3`` flag: aifc, asynchat, asyncore, bdb, bsddb,
95		- ConfigParser, cookielib, csv, difflib, DocXMLRPCServer, email, filecmp,
96		- fileinput, inspect, logging, modulefinder, pdb, pickle, profile, pstats,
97		- pydoc, re, rlcompleter, SimpleXMLRPCServer, shelve, socket, subprocess,
98		- sqlite3, tarfile, Tkinter, test.test_support, textwrap, threading, tokenize,
99		- traceback, urlparse, wsgiref, xml, xmlrpclib.
	95	+ ConfigParser, cookielib, csv, difflib, distutils, DocXMLRPCServer, email,
	96	+ filecmp, fileinput, inspect, logging, modulefinder, pdb, pickle, profile,
	97	+ pstats, pydoc, re, rlcompleter, SimpleXMLRPCServer, shelve, socket,
	98	+ subprocess, sqlite3, tarfile, Tkinter, test.test_support, textwrap,
	99	+ threading, tokenize, traceback, urlparse, wsgiref, xml, xmlrpclib.
100	100
101	101	- Issue #3039: Fix tarfile.TarFileCompat.writestr() which always
102	102	raised an AttributeError.

0 commit comments

Comments

0 (0)