mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Undo potentially confusing name change in packaging.

Browse source 
This method was named reinitialize_command in distutils and accompanied
by a comment suggesting to change it to get_reinitialized_command.
Following that, I did the change for distutils2, but it proved
confusing: The Distribution object has an internal cache of command
objects, to make sure only one instance is ever used, and the name
get_reinitialized_command could suggest that the object returned was
independent of that cache, which it was not.  I’m reverting the name
change to make code clearer.
This commit is contained in:
Éric Araujo 2011-11-06 06:54:05 +01:00
parent 4e377f215d
commit a963e0d917
8 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/packaging/command/bdist.py
View file

@ -126,7 +126,7 @@ class bdist(Command):
# Reinitialize and run each command.
for i in range(len(self.formats)):
cmd_name = commands[i]
sub_cmd = self.get_reinitialized_command(cmd_name)
sub_cmd = self.reinitialize_command(cmd_name)
sub_cmd.format = self.formats[i]
# passing the owner and group names for tar archiving

4
Lib/packaging/command/bdist_dumb.py
View file

@ -80,8 +80,8 @@ class bdist_dumb(Command):
if not self.skip_build:
self.run_command('build')
install = self.get_reinitialized_command('install_dist',
reinit_subcommands=True)
install = self.reinitialize_command('install_dist',
reinit_subcommands=True)
install.root = self.bdist_dir
install.skip_build = self.skip_build
install.warn_dir = False

6
Lib/packaging/command/bdist_msi.py
View file

@ -183,13 +183,13 @@ class bdist_msi(Command):
if not self.skip_build:
self.run_command('build')
install = self.get_reinitialized_command('install_dist',
reinit_subcommands=True)
install = self.reinitialize_command('install_dist',
reinit_subcommands=True)
install.prefix = self.bdist_dir
install.skip_build = self.skip_build
install.warn_dir = False
install_lib = self.get_reinitialized_command('install_lib')
install_lib = self.reinitialize_command('install_lib')
# we do not want to include pyc or pyo files
install_lib.compile = False
install_lib.optimize = 0

5
Lib/packaging/command/bdist_wininst.py
View file

@ -115,14 +115,13 @@ class bdist_wininst(Command):
if not self.skip_build:
self.run_command('build')
install = self.get_reinitialized_command('install',
reinit_subcommands=True)
install = self.reinitialize_command('install', reinit_subcommands=True)
install.root = self.bdist_dir
install.skip_build = self.skip_build
install.warn_dir = False
install.plat_name = self.plat_name
install_lib = self.get_reinitialized_command('install_lib')
install_lib = self.reinitialize_command('install_lib')
# we do not want to include pyc or pyo files
install_lib.compile = False
install_lib.optimize = 0

4
Lib/packaging/command/cmd.py
View file

@ -318,8 +318,8 @@ class Command:
cmd_obj.ensure_finalized()
return cmd_obj
def get_reinitialized_command(self, command, reinit_subcommands=False):
return self.distribution.get_reinitialized_command(
def reinitialize_command(self, command, reinit_subcommands=False):
return self.distribution.reinitialize_command(
command, reinit_subcommands)
def run_command(self, command):

2
Lib/packaging/command/test.py
View file

@ -56,7 +56,7 @@ class test(Command):
prev_syspath = sys.path[:]
try:
# build release
build = self.get_reinitialized_command('build')
build = self.reinitialize_command('build')
self.run_command('build')
sys.path.insert(0, build.build_lib)