mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 03:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Rename parameters to match the documentation (which

Browse source 
in turn matches Microsoft's documentation).
Drop unused parameter in CAB.append.
This commit is contained in:
Martin v. Löwis 2006-05-01 16:14:16 +00:00
parent 5f4307491e
commit a07fbce451
2 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/distutils/command/bdist_msi.py
View file

@ -1,5 +1,5 @@
# -*- coding: iso-8859-1 -*- # -*- coding: iso-8859-1 -*-
# Copyright (C) 2005 Martin v. Löwis # Copyright (C) 2005, 2006 Martin v. Löwis
# Licensed to PSF under a Contributor Agreement. # Licensed to PSF under a Contributor Agreement.
# The bdist_wininst command proper # The bdist_wininst command proper
# based on bdist_wininst # based on bdist_wininst
@ -16,7 +16,7 @@ from distutils.version import StrictVersion
from distutils.errors import DistutilsOptionError from distutils.errors import DistutilsOptionError
from distutils import log from distutils import log
import msilib import msilib
from msilib import schema, sequence, uisample from msilib import schema, sequence, text
from msilib import Directory, Feature, Dialog, add_data from msilib import Directory, Feature, Dialog, add_data
class PyDialog(Dialog): class PyDialog(Dialog):
@ -374,8 +374,8 @@ class bdist_msi (Command):
("MaintenanceTypeDlg", "Installed AND NOT RESUME AND NOT Preselected", 1250), ("MaintenanceTypeDlg", "Installed AND NOT RESUME AND NOT Preselected", 1250),
("ProgressDlg", None, 1280)]) ("ProgressDlg", None, 1280)])
add_data(db, 'ActionText', uisample.ActionText) add_data(db, 'ActionText', text.ActionText)
add_data(db, 'UIText', uisample.UIText) add_data(db, 'UIText', text.UIText)
##################################################################### #####################################################################
# Standard dialogs: FatalError, UserExit, ExitDialog # Standard dialogs: FatalError, UserExit, ExitDialog
fatal=PyDialog(db, "FatalError", x, y, w, h, modal, title, fatal=PyDialog(db, "FatalError", x, y, w, h, modal, title,
@ -502,9 +502,9 @@ class bdist_msi (Command):
seldlg.back("< Back", None, active=0) seldlg.back("< Back", None, active=0)
c = seldlg.next("Next >", "Cancel") c = seldlg.next("Next >", "Cancel")
c.event("SetTargetPath", "TARGETDIR", order=1) c.event("SetTargetPath", "TARGETDIR", ordering=1)
c.event("SpawnWaitDialog", "WaitForCostingDlg", order=2) c.event("SpawnWaitDialog", "WaitForCostingDlg", ordering=2)
c.event("EndDialog", "Return", order=3) c.event("EndDialog", "Return", ordering=3)
c = seldlg.cancel("Cancel", "DirectoryCombo") c = seldlg.cancel("Cancel", "DirectoryCombo")
c.event("SpawnDialog", "CancelDlg") c.event("SpawnDialog", "CancelDlg")
@ -561,7 +561,7 @@ class bdist_msi (Command):
c = whichusers.next("Next >", "Cancel") c = whichusers.next("Next >", "Cancel")
c.event("[ALLUSERS]", "1", 'WhichUsers="ALL"', 1) c.event("[ALLUSERS]", "1", 'WhichUsers="ALL"', 1)
c.event("EndDialog", "Return", order = 2) c.event("EndDialog", "Return", ordering = 2)
c = whichusers.cancel("Cancel", "AdminInstall") c = whichusers.cancel("Cancel", "AdminInstall")
c.event("SpawnDialog", "CancelDlg") c.event("SpawnDialog", "CancelDlg")

15
Lib/msilib/__init__.py
View file

@ -196,11 +196,9 @@ class CAB:
self.filenames.add(logical) self.filenames.add(logical)
return logical return logical
def append(self, full, file, logical = None): def append(self, full, logical):
if os.path.isdir(full): if os.path.isdir(full):
return return
if not logical:
logical = self.gen_id(dir, file)
self.index += 1 self.index += 1
self.files.append((full, logical)) self.files.append((full, logical))
return self.index, logical return self.index, logical
@ -330,7 +328,7 @@ class Directory:
logical = self.keyfiles[file] logical = self.keyfiles[file]
else: else:
logical = None logical = None
sequence, logical = self.cab.append(absolute, file, logical) sequence, logical = self.cab.append(absolute, logical)
assert logical not in self.ids assert logical not in self.ids
self.ids.add(logical) self.ids.add(logical)
short = self.make_short(file) short = self.make_short(file)
@ -400,13 +398,14 @@ class Control:
self.dlg = dlg self.dlg = dlg
self.name = name self.name = name
def event(self, ev, arg, cond = "1", order = None): def event(self, event, argument, condition = "1", ordering = None):
add_data(self.dlg.db, "ControlEvent", add_data(self.dlg.db, "ControlEvent",
[(self.dlg.name, self.name, ev, arg, cond, order)]) [(self.dlg.name, self.name, event, argument,
condition, ordering)])
def mapping(self, ev, attr): def mapping(self, mapping, attribute):
add_data(self.dlg.db, "EventMapping", add_data(self.dlg.db, "EventMapping",
[(self.dlg.name, self.name, ev, attr)]) [(self.dlg.name, self.name, event, attribute)])
def condition(self, action, condition): def condition(self, action, condition):
add_data(self.dlg.db, "ControlCondition", add_data(self.dlg.db, "ControlCondition",