summaryrefslogtreecommitdiffstats
path: root/Lib/distutils/command/bdist_msi.py
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2006-05-01 16:14:16 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2006-05-01 16:14:16 (GMT)
commita07fbce4516820b61bce310a6b5f9437b9d1e4ca (patch)
tree285413755cf6860f472e5f72ff105e0547818e68 /Lib/distutils/command/bdist_msi.py
parent5f4307491e3725ff67def1e8b3c08a008e7e097e (diff)
downloadcpython-a07fbce4516820b61bce310a6b5f9437b9d1e4ca.zip
cpython-a07fbce4516820b61bce310a6b5f9437b9d1e4ca.tar.gz
cpython-a07fbce4516820b61bce310a6b5f9437b9d1e4ca.tar.bz2
Rename parameters to match the documentation (which
in turn matches Microsoft's documentation). Drop unused parameter in CAB.append.
Diffstat (limited to 'Lib/distutils/command/bdist_msi.py')
-rw-r--r--Lib/distutils/command/bdist_msi.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/Lib/distutils/command/bdist_msi.py b/Lib/distutils/command/bdist_msi.py
index f05d66c..75db877 100644
--- a/Lib/distutils/command/bdist_msi.py
+++ b/Lib/distutils/command/bdist_msi.py
@@ -1,5 +1,5 @@
# -*- 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.
# The bdist_wininst command proper
# based on bdist_wininst
@@ -16,7 +16,7 @@ from distutils.version import StrictVersion
from distutils.errors import DistutilsOptionError
from distutils import log
import msilib
-from msilib import schema, sequence, uisample
+from msilib import schema, sequence, text
from msilib import Directory, Feature, Dialog, add_data
class PyDialog(Dialog):
@@ -374,8 +374,8 @@ class bdist_msi (Command):
("MaintenanceTypeDlg", "Installed AND NOT RESUME AND NOT Preselected", 1250),
("ProgressDlg", None, 1280)])
- add_data(db, 'ActionText', uisample.ActionText)
- add_data(db, 'UIText', uisample.UIText)
+ add_data(db, 'ActionText', text.ActionText)
+ add_data(db, 'UIText', text.UIText)
#####################################################################
# Standard dialogs: FatalError, UserExit, ExitDialog
fatal=PyDialog(db, "FatalError", x, y, w, h, modal, title,
@@ -502,9 +502,9 @@ class bdist_msi (Command):
seldlg.back("< Back", None, active=0)
c = seldlg.next("Next >", "Cancel")
- c.event("SetTargetPath", "TARGETDIR", order=1)
- c.event("SpawnWaitDialog", "WaitForCostingDlg", order=2)
- c.event("EndDialog", "Return", order=3)
+ c.event("SetTargetPath", "TARGETDIR", ordering=1)
+ c.event("SpawnWaitDialog", "WaitForCostingDlg", ordering=2)
+ c.event("EndDialog", "Return", ordering=3)
c = seldlg.cancel("Cancel", "DirectoryCombo")
c.event("SpawnDialog", "CancelDlg")
@@ -561,7 +561,7 @@ class bdist_msi (Command):
c = whichusers.next("Next >", "Cancel")
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.event("SpawnDialog", "CancelDlg")