style guide

1 files changed, 75 insertions, 70 deletions

diff --git a/dispatch.py b/dispatch.py
index 1203edf2e..55fb99970 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -43,76 +43,81 @@ from upgrade import upgradeSwapSuggestion, upgradeMigrateFind
 # in the second case, the function is called directly from the dispatcher
 
 installSteps = [
-    ( "language", ("intf", "id.instLanguage") ),
-    ( "keyboard", ("id.instLanguage", "id.keyboard") ),
-    ( "mouse", ("id.mouse", ) ),
-    ( "welcome", ("id.configFileData", ) ),
-    ( "reconfigwelcome", () ),
-    ( "reconfigkeyboard", ("id.instLanguage", "id.keyboard" ) ),
-    ( "installtype", ("dispatch", "id", "method", "intf") ),
-    ( "findinstall", ("dispatch", "intf", "id", "instPath") ),
-    ( "partitionmethod", ("id.partitions", "id.instClass") ),
-    ( "partitionobjinit", partitionObjectsInitialize, ("id.diskset", "id.partitions", "dir", "intf") ),
-    ( "partitionmethodsetup", partitionMethodSetup, ("id.partitions", "dispatch") ),
-    ( "autopartition", ("id.diskset", "id.partitions", "intf", "dispatch") ),
-    ( "autopartitionexecute", doAutoPartition, ("dir", "id.diskset", "id.partitions", "intf")),
-    ( "fdisk", ("id.diskset", "id.partitions")),
-    ( "partition", ("id.fsset", "id.diskset", "id.partitions", "intf")),
-    ( "upgrademount", upgradeMountFilesystems, ("intf", "id.upgradeRoot",
-                                                "id.fsset", "instPath")),
-    ( "upgradecontinue", queryUpgradeContinue, ("intf", "dir")),
-    ( "upgradeswapsuggestion", upgradeSwapSuggestion, ("dispatch", "id",
-                                                       "instPath") ),
-    ( "addswap", ("intf", "id.fsset", "instPath", "id.upgradeSwapInfo") ),
-    ( "partitiondone", partitioningComplete, ("dispatch", "id.bootloader",
-                                              "id.fsset", "id.diskset",
-                                              "id.partitions") ),
-    ( "upgrademigfind", upgradeMigrateFind, ("dispatch", "id.partitions")),
-    ( "upgrademigratefs",  ("id.fsset", "id.partitions",) ),
-    ( "bootloadersetup", bootloaderSetupChoices, ("dispatch", "id.bootloader",
-                                                  "id.fsset", "id.diskset",
-                                                  "dir") ),
-    ( "bootloader", ("dispatch", "id.bootloader", "id.fsset", "id.diskset") ),
-    ( "network", ("id.network",) ),
-    ( "firewall", ("id.network", "id.firewall") ),
-    ( "languagesupport", ("id.langSupport", ) ),
-    ( "timezone", ("id.instLanguage", "id.timezone", ) ),
-    ( "accounts", ("id.rootPassword", "id.accounts", ) ),
-    ( "authentication", ("id.auth", ) ),
-    ( "readcomps", readPackages, ("intf", "method", "id" )),
-    ( "findpackages", upgradeFindPackages, ("intf", "method", "id",
-                                            "instPath")),
-    ( "package-selection", ("id.comps", "dispatch") ),
-    ( "indivpackage", ("id.comps", "id.hdList", ) ),
-    ( "handleX11pkgs", handleX11Packages, ("dir", "intf", "dispatch",
-                                           "id", "instPath" )),
-    ( "checkdeps", checkDependencies, ("dir", "intf", "dispatch",
-                                       "id", "instPath" )),
-    ( "dependencies", ("id.comps", "id.dependencies",) ),
-    ( "videocard", ("dispatch", "id.xconfig", "id.videocard")),
-    ( "confirminstall", () ),
-    ( "confirmupgrade", () ),
-    ( "install", ("dir", "intf", "id", ) ),
-    ( "enablefilesystems", turnOnFilesystems, ( "dir", "id.fsset",
-                                                "id.diskset", "id.upgrade",
-                                                "instPath") ),
-    ( "preinstallconfig", doPreInstall, ("method", "id", "intf", "instPath", "dir")),
-    ( "installpackages", doInstall, ( "method", "id", "intf", "instPath" )),
-    ( "postinstallconfig", doPostInstall, ("method", "id", "intf", "instPath")),
-    ( "writeconfig", writeConfiguration, ("id", "instPath" )),
-    ( "instbootloader", writeBootloader, ("intf", "instPath", "id.fsset", 
-                                          "id.bootloader", "id.langSupport",
-                                          "id.comps") ),
-    ( "bootdisk", ("dir", "dispatch", "id.fsset") ),
-    ( "makebootdisk", makeBootdisk, ("intf", "id.floppyDevice",
-				     "id.hdList", "instPath") ),
-    ( "monitor", ("id.xconfig", "id.monitor") ),
-    ( "xcustom", ("id.xconfig", "id.monitor", "id.videocard",
-                  "id.desktop", "id.comps") ),
-    ( "writexconfig", writeXConfiguration, ("id", "instPath")),
-    ( "writeksconfig", writeKSConfiguration, ("id", "instPath")),
-    ( "complete", () ),
-    ( "reconfigcomplete", () )
+    ("language", ("intf", "id.instLanguage")),
+    ("keyboard", ("id.instLanguage", "id.keyboard")),
+    ("mouse", ("id.mouse",)),
+    ("welcome", ("id.configFileData",)),
+    ("reconfigwelcome", ()),
+    ("reconfigkeyboard", ("id.instLanguage", "id.keyboard")),
+    ("installtype", ("dispatch", "id", "method", "intf")),
+    ("findinstall", ("dispatch", "intf", "id", "instPath")),
+    ("partitionmethod", ("id.partitions", "id.instClass")),
+    ("partitionobjinit", partitionObjectsInitialize, ("id.diskset",
+                                                      "id.partitions",
+                                                      "dir", "intf")),
+    ("partitionmethodsetup", partitionMethodSetup, ("id.partitions",
+                                                    "dispatch")),
+    ("autopartition", ("id.diskset", "id.partitions", "intf", "dispatch")),
+    ("autopartitionexecute", doAutoPartition, ("dir", "id.diskset",
+                                               "id.partitions", "intf")),
+    ("fdisk", ("id.diskset", "id.partitions")),
+    ("partition", ("id.fsset", "id.diskset", "id.partitions", "intf")),
+    ("upgrademount", upgradeMountFilesystems, ("intf", "id.upgradeRoot",
+                                               "id.fsset", "instPath")),
+    ("upgradecontinue", queryUpgradeContinue, ("intf", "dir")),
+    ("upgradeswapsuggestion", upgradeSwapSuggestion, ("dispatch", "id",
+                                                      "instPath")),
+    ("addswap", ("intf", "id.fsset", "instPath", "id.upgradeSwapInfo")),
+    ("partitiondone", partitioningComplete, ("dispatch", "id.bootloader",
+                                             "id.fsset", "id.diskset",
+                                             "id.partitions")),
+    ("upgrademigfind", upgradeMigrateFind, ("dispatch", "id.partitions")),
+    ("upgrademigratefs",  ("id.fsset", "id.partitions")),
+    ("bootloadersetup", bootloaderSetupChoices, ("dispatch", "id.bootloader",
+                                                 "id.fsset", "id.diskset",
+                                                 "dir")),
+    ("bootloader", ("dispatch", "id.bootloader", "id.fsset", "id.diskset")),
+    ("network", ("id.network",)),
+    ("firewall", ("id.network", "id.firewall")),
+    ("languagesupport", ("id.langSupport",)),
+    ("timezone", ("id.instLanguage", "id.timezone")),
+    ("accounts", ("id.rootPassword", "id.accounts")),
+    ("authentication", ("id.auth",)),
+    ("readcomps", readPackages, ("intf", "method", "id")),
+    ("findpackages", upgradeFindPackages, ("intf", "method", "id",
+                                           "instPath")),
+    ("package-selection", ("id.comps", "dispatch")),
+    ("indivpackage", ("id.comps", "id.hdList")),
+    ("handleX11pkgs", handleX11Packages, ("dir", "intf", "dispatch",
+                                          "id", "instPath")),
+    ("checkdeps", checkDependencies, ("dir", "intf", "dispatch",
+                                      "id", "instPath")),
+    ("dependencies", ("id.comps", "id.dependencies")),
+    ("videocard", ("dispatch", "id.xconfig", "id.videocard")),
+    ("confirminstall", ()),
+    ("confirmupgrade", ()),
+    ("install", ("dir", "intf", "id")),
+    ("enablefilesystems", turnOnFilesystems, ("dir", "id.fsset",
+                                              "id.diskset", "id.upgrade",
+                                              "instPath")),
+    ("preinstallconfig", doPreInstall, ("method", "id", "intf", "instPath",
+                                        "dir")),
+    ("installpackages", doInstall, ("method", "id", "intf", "instPath")),
+    ("postinstallconfig", doPostInstall, ("method", "id", "intf", "instPath")),
+    ("writeconfig", writeConfiguration, ("id", "instPath")),
+    ("instbootloader", writeBootloader, ("intf", "instPath", "id.fsset", 
+                                         "id.bootloader", "id.langSupport",
+                                         "id.comps")),
+    ("bootdisk", ("dir", "dispatch", "id.fsset")),
+    ("makebootdisk", makeBootdisk, ("intf", "id.floppyDevice",
+                                    "id.hdList", "instPath")),
+    ("monitor", ("id.xconfig", "id.monitor")),
+    ("xcustom", ("id.xconfig", "id.monitor", "id.videocard",
+                 "id.desktop", "id.comps")),
+    ("writexconfig", writeXConfiguration, ("id", "instPath")),
+    ("writeksconfig", writeKSConfiguration, ("id", "instPath")),
+    ("complete", ()),
+    ("reconfigcomplete", ())
     ]
 
 class Dispatcher: