Format wix and wix_packager using pep8

2 files changed, 93 insertions, 94 deletions

diff --git a/cerbero/packages/wix.py b/cerbero/packages/wix.py
index 62a710b3..1f2b50ad 100644
--- a/cerbero/packages/wix.py
+++ b/cerbero/packages/wix.py
@@ -51,8 +51,8 @@ class VSTemplatePackage(Package):
     def devel_files_list(self):
         files = []
         for f in [self.vs_template_dir, self.vs_wizard_dir]:
-            files  += shell.ls_dir (os.path.join(self.config.prefix,f),
-                self.config.prefix)
+            files += shell.ls_dir(os.path.join(self.config.prefix, f),
+                                  self.config.prefix)
         return files
 
 
@@ -122,7 +122,7 @@ class WixBase():
             i = int(version)
             if i > 9999:
                 raise FatalError("Unsupported version number, mayor and minor "
-                        "must be less than 9999")
+                                 "must be less than 9999")
             elif i > 255:
                 tversions.append(version[:-2])
                 tversions.append(version[-2:])
@@ -153,20 +153,20 @@ class MergeModule(WixBase):
 
     def _add_module(self):
         self.module = etree.SubElement(self.root, "Module",
-            Id=self._format_id(self.package.name),
-            Version=self._format_version(self.package.version),
-            Language='1033')
+                                       Id=self._format_id(self.package.name),
+                                       Version=self._format_version(self.package.version),
+                                       Language='1033')
 
     def _add_package(self):
         self.pkg = etree.SubElement(self.module, "Package",
-            Id=self.package.uuid or self._get_uuid(),
-            Description=self.package.shortdesc,
-            Comments=self.package.longdesc,
-            Manufacturer=self.package.vendor)
+                                    Id=self.package.uuid or self._get_uuid(),
+                                    Description=self.package.shortdesc,
+                                    Comments=self.package.longdesc,
+                                    Manufacturer=self.package.vendor)
 
     def _add_root_dir(self):
         self.rdir = etree.SubElement(self.module, "Directory",
-            Id='TARGETDIR', Name='SourceDir')
+                                     Id='TARGETDIR', Name='SourceDir')
         self._dirnodes[''] = self.rdir
 
     def _add_files(self):
@@ -185,8 +185,8 @@ class MergeModule(WixBase):
 
         parent = self._dirnodes[parentpath]
         dirnode = etree.SubElement(parent, "Directory",
-            Id=self._format_path_id(dirpath),
-            Name=os.path.split(dirpath)[1])
+                                   Id=self._format_path_id(dirpath),
+                                   Name=os.path.split(dirpath)[1])
         self._dirnodes[dirpath] = dirnode
 
     def _add_file(self, filepath):
@@ -195,7 +195,7 @@ class MergeModule(WixBase):
         dirnode = self._dirnodes[dirpath]
 
         component = etree.SubElement(dirnode, 'Component',
-            Id=self._format_path_id(filepath), Guid=self._get_uuid())
+                                     Id=self._format_path_id(filepath), Guid=self._get_uuid())
 
         filepath = os.path.join(self.prefix, filepath)
         p_id = self._format_path_id(filepath, True)
@@ -222,28 +222,28 @@ class VSMergeModule(MergeModule):
 
     def _add_vs_templates(self):
         etree.SubElement(self.module, 'PropertyRef',
-            Id='VS_PROJECTTEMPLATES_DIR')
+                         Id='VS_PROJECTTEMPLATES_DIR')
         etree.SubElement(self.module, 'PropertyRef',
-            Id='VS_WIZARDS_DIR')
+                         Id='VS_WIZARDS_DIR')
         etree.SubElement(self.module, 'CustomActionRef',
-            Id='VS2010InstallVSTemplates')
+                         Id='VS2010InstallVSTemplates')
         etree.SubElement(self.module, 'CustomActionRef',
-            Id='VC2010InstallVSTemplates')
+                         Id='VC2010InstallVSTemplates')
         prop = etree.SubElement(self.module, 'SetProperty',
-            Id="VSPROJECTTEMPLATESDIR", After="AppSearch",
-            Value="[VS_PROJECTTEMPLATES_DIR]\\%s" % \
-                self.package.vs_template_name or "")
+                                Id="VSPROJECTTEMPLATESDIR", After="AppSearch",
+                                Value="[VS_PROJECTTEMPLATES_DIR]\\%s" %
+                                self.package.vs_template_name or "")
         prop.text = "VS_PROJECTTEMPLATES_DIR"
         prop = etree.SubElement(self.module, 'SetProperty',
-            Id="VSWIZARDSDIR", After="AppSearch",
-            Value="[VS_WIZARDS_DIR]\\%s" % \
-                os.path.split(self.package.vs_template_dir)[1])
+                                Id="VSWIZARDSDIR", After="AppSearch",
+                                Value="[VS_WIZARDS_DIR]\\%s" %
+                                os.path.split(self.package.vs_template_dir)[1])
         prop.text = "VS_WIZARDS_DIR"
 
         self._wizard_dir = etree.SubElement(self.rdir, 'Directory',
-            Id='VSPROJECTTEMPLATESDIR')
+                                            Id='VSPROJECTTEMPLATESDIR')
         self._tpl_dir = etree.SubElement(self.rdir, 'Directory',
-            Id='VSWIZARDSDIR')
+                                         Id='VSWIZARDSDIR')
         self._dirnodes[self.package.vs_template_dir] = self._tpl_dir
         self._dirnodes[self.package.vs_wizard_dir] = self._wizard_dir
 
@@ -263,9 +263,9 @@ class WixConfig(WixBase):
 
     def write(self, output_dir):
         config_out_path = os.path.join(output_dir,
-                os.path.basename(self.wix_config))
+                                       os.path.basename(self.wix_config))
         shutil.copy(self.config_path, os.path.join(output_dir,
-                    os.path.basename(self.wix_config)))
+                                                   os.path.basename(self.wix_config)))
         replacements = {
             "@ProductID@": '*',
             "@UpgradeCode@": self.package.get_wix_upgrade_code(),
@@ -279,7 +279,7 @@ class WixConfig(WixBase):
             "@ProgramFilesFolder@": self._program_folder(),
             "@Platform@": self._platform(),
             "@UIType@": self.ui_type
-            }
+        }
         shell.replace(config_out_path, replacements)
         return config_out_path
 
@@ -325,7 +325,7 @@ class MSI(WixBase):
 
     def _parse_sources(self):
         sources_path = self.package.resources_wix_installer or \
-                os.path.join(self.config.data_dir, self.wix_sources)
+            os.path.join(self.config.data_dir, self.wix_sources)
         with open(sources_path, 'r') as f:
             self.root = etree.fromstring(f.read())
         for element in self.root.iter():
@@ -342,7 +342,7 @@ class MSI(WixBase):
     def _fill(self):
         self._add_install_dir()
         if isinstance(self.package, App):
-            self._add_application_merge_module ()
+            self._add_application_merge_module()
         else:
             self._add_merge_modules()
         if isinstance(self.package, SDKPackage):
@@ -355,21 +355,21 @@ class MSI(WixBase):
 
     def _add_application_merge_module(self):
         self.main_feature = etree.SubElement(self.product, "Feature",
-            Id=self._format_id(self.package.name + '_app'),
-            Title=self.package.title, Level='1', Display="expand",
-            AllowAdvertise="no", ConfigurableDirectory="INSTALLDIR")
+                                             Id=self._format_id(self.package.name + '_app'),
+                                             Title=self.package.title, Level='1', Display="expand",
+                                             AllowAdvertise="no", ConfigurableDirectory="INSTALLDIR")
 
         self._add_merge_module(self.package, True, True, [])
 
         etree.SubElement(self.installdir, 'Merge',
-            Id=self._package_id(self.package.name), Language='1033',
-            SourceFile=self.packages_deps[self.package], DiskId='1')
+                         Id=self._package_id(self.package.name), Language='1033',
+                         SourceFile=self.packages_deps[self.package], DiskId='1')
 
     def _add_merge_modules(self):
         self.main_feature = etree.SubElement(self.product, "Feature",
-            Id=self._format_id(self.package.name),
-            Title=self.package.title, Level='1', Display="expand",
-            AllowAdvertise="no", ConfigurableDirectory="INSTALLDIR")
+                                             Id=self._format_id(self.package.name),
+                                             Title=self.package.title, Level='1', Display="expand",
+                                             AllowAdvertise="no", ConfigurableDirectory="INSTALLDIR")
 
         packages = [(self.store.get_package(x[0]), x[1], x[2]) for x in
                     self.package.packages]
@@ -378,11 +378,11 @@ class MSI(WixBase):
         packages = [x for x in packages if x[0] in list(self.packages_deps.keys())]
         if len(packages) == 0:
             raise FatalError("All packages are empty: %s" %
-                    [x[0] for x in self.package.packages])
+                             [x[0] for x in self.package.packages])
 
         # Fill the list of required packages, which are the ones installed by
         # a package that is always installed
-        req = [x[0] for x in packages if x[1] == True]
+        req = [x[0] for x in packages if x[1] is True]
         required_packages = req[:]
         for p in req:
             required_packages.extend(self.store.get_package_deps(p, True))
@@ -395,12 +395,12 @@ class MSI(WixBase):
         # Add a merge module ref for all the packages
         for package, path in self.packages_deps.items():
             etree.SubElement(self.installdir, 'Merge',
-                Id=self._package_id(package.name), Language='1033',
-                SourceFile=path, DiskId='1')
+                             Id=self._package_id(package.name), Language='1033',
+                             SourceFile=path, DiskId='1')
 
     def _add_dir(self, parent, dir_id, name):
         tdir = etree.SubElement(parent, "Directory",
-            Id=dir_id, Name=name)
+                                Id=dir_id, Name=name)
         return tdir
 
     def _add_install_dir(self):
@@ -408,13 +408,13 @@ class MSI(WixBase):
         # FIXME: Add a way to install to ProgramFilesFolder
         if isinstance(self.package, App):
             installdir = self._add_dir(self.target_dir,
-                    '$(var.PlatformProgramFilesFolder)', 'ProgramFilesFolder')
+                                       '$(var.PlatformProgramFilesFolder)', 'ProgramFilesFolder')
             self.installdir = self._add_dir(installdir, 'INSTALLDIR',
-                    '$(var.ProductName)')
+                                            '$(var.ProductName)')
             self.bindir = self._add_dir(self.installdir, 'INSTALLBINDIR', 'bin')
         else:
             installdir = self._add_dir(self.target_dir, 'INSTALLDIR',
-                    self.package.get_install_dir())
+                                       self.package.get_install_dir())
             versiondir = self._add_dir(installdir, "Version", self.package.sdk_version)
             archdir = self._add_dir(versiondir, 'Architecture',
                                     self.config.target_arch)
@@ -436,30 +436,30 @@ class MSI(WixBase):
     def _customize_ui(self):
         # Banner Dialog and License
         for path, var in [(self.BANNER_BMP, 'BannerBmp'),
-                (self.DIALOG_BMP, 'DialogBmp'),
-                (self.LICENSE_RTF, 'LicenseRtf')]:
+                          (self.DIALOG_BMP, 'DialogBmp'),
+                          (self.LICENSE_RTF, 'LicenseRtf')]:
             path = self.package.relative_path(path)
             if self._with_wine:
                 path = to_winepath(path)
             if os.path.exists(path):
                 etree.SubElement(self.product, 'WixVariable',
-                        Id='WixUI%s' % var, Value=path)
+                                 Id='WixUI%s' % var, Value=path)
         # Icon
         path = self.package.relative_path(self.ICON)
         if self._with_wine:
             path = to_winepath(path)
         if os.path.exists(path):
             etree.SubElement(self.product, 'Icon',
-                Id='MainIcon', SourceFile=path)
+                             Id='MainIcon', SourceFile=path)
 
     def _add_sdk_root_env_variable(self):
         envcomponent = etree.SubElement(self.installdir, 'Component',
-                Id='EnvironmentVariables', Guid=self._get_uuid())
+                                        Id='EnvironmentVariables', Guid=self._get_uuid())
         env = etree.SubElement(envcomponent, 'Environment', Id="SdkRootEnv",
-                Action="set", Part="all", Name=self.package.get_root_env_var(),
-                Permanent="no", Value='[SDKROOTDIR]')
+                               Action="set", Part="all", Name=self.package.get_root_env_var(),
+                               Permanent="no", Value='[SDKROOTDIR]')
         etree.SubElement(self.main_feature, 'ComponentRef',
-                Id='EnvironmentVariables')
+                         Id='EnvironmentVariables')
 
     def _add_registry_install_dir(self):
         # Get the package name. Both devel and runtime will share the same
@@ -469,25 +469,25 @@ class MSI(WixBase):
         # Add INSTALLDIR in the registry only for the runtime package
         if self.package.package_mode == PackageType.RUNTIME:
             regcomponent = etree.SubElement(self.installdir, 'Component',
-                    Id='RegistryInstallDir', Guid=self._get_uuid())
+                                            Id='RegistryInstallDir', Guid=self._get_uuid())
             regkey = etree.SubElement(regcomponent, 'RegistryKey',
-                    Id='RegistryInstallDirRoot',
-                    Action='createAndRemoveOnUninstall',
-                    Key=self._registry_key(name),
-                    Root=self.REG_ROOT)
+                                      Id='RegistryInstallDirRoot',
+                                      Action='createAndRemoveOnUninstall',
+                                      Key=self._registry_key(name),
+                                      Root=self.REG_ROOT)
             etree.SubElement(regkey, 'RegistryValue',
-                    Id='RegistryInstallDirValue',
-                    Type='string', Name='InstallDir', Value='[INSTALLDIR]')
+                             Id='RegistryInstallDirValue',
+                             Type='string', Name='InstallDir', Value='[INSTALLDIR]')
             etree.SubElement(regkey, 'RegistryValue',
-                    Id='RegistryVersionValue',
-                    Type='string', Name='Version',
-                    Value=self.package.version)
+                             Id='RegistryVersionValue',
+                             Type='string', Name='Version',
+                             Value=self.package.version)
             etree.SubElement(regkey, 'RegistryValue',
-                    Id='RegistrySDKVersionValue',
-                    Type='string', Name='SdkVersion',
-                    Value=self.package.sdk_version)
+                             Id='RegistrySDKVersionValue',
+                             Type='string', Name='SdkVersion',
+                             Value=self.package.sdk_version)
             etree.SubElement(self.main_feature, 'ComponentRef',
-                    Id='RegistryInstallDir')
+                             Id='RegistryInstallDir')
 
     def _add_get_install_dir_from_registry(self):
         name = self._package_var().replace(' ', '')
@@ -498,17 +498,17 @@ class MSI(WixBase):
 
         # Get INSTALLDIR from the registry key
         installdir_prop = etree.SubElement(self.product, 'Property',
-                Id='INSTALLDIR')
+                                           Id='INSTALLDIR')
         etree.SubElement(installdir_prop, 'RegistrySearch', Id=name,
-                Type="raw", Root=self.REG_ROOT, Key=key, Name='InstallDir')
+                         Type="raw", Root=self.REG_ROOT, Key=key, Name='InstallDir')
 
     def _add_merge_module(self, package, required, selected,
                           required_packages):
         # Create a new feature for this package
         feature = etree.SubElement(self.main_feature, 'Feature',
-                Id=self._format_id(package.name), Title=package.shortdesc,
-                Level=self._format_level(selected),
-                Display='expand', Absent=self._format_absent(required))
+                                   Id=self._format_id(package.name), Title=package.shortdesc,
+                                   Level=self._format_level(selected),
+                                   Display='expand', Absent=self._format_absent(required))
         deps = self.store.get_package_deps(package, True)
 
         # Add all the merge modules required by this package, but excluding
@@ -533,28 +533,28 @@ class MSI(WixBase):
     def _add_start_menu_shortcuts(self):
         # Create a folder with the application name in the Start Menu folder
         programs = etree.SubElement(self.target_dir, 'Directory',
-                Id='ProgramMenuFolder')
+                                    Id='ProgramMenuFolder')
         etree.SubElement(programs, 'Directory', Id='ApplicationProgramsFolder',
-                Name='$(var.ProductName)')
+                         Name='$(var.ProductName)')
         # Add the shortcut to the installer package
         appf = etree.SubElement(self.product, 'DirectoryRef',
-                Id='ApplicationProgramsFolder')
+                                Id='ApplicationProgramsFolder')
         apps = etree.SubElement(appf, 'Component', Id='ApplicationShortcut',
-                Guid=self._get_uuid())
+                                Guid=self._get_uuid())
         for desc, path, _, _ in self.package.commands[self.config.target_platform]:
             etree.SubElement(apps, 'Shortcut',
-                    Id='ApplicationStartMenuShortcut', Name=desc,
-                    Description=desc, Target='[INSTALLBINDIR]' + path,
-                    WorkingDirectory='INSTALLBINDIR',
-                    Icon='MainIcon')
+                             Id='ApplicationStartMenuShortcut', Name=desc,
+                             Description=desc, Target='[INSTALLBINDIR]' + path,
+                             WorkingDirectory='INSTALLBINDIR',
+                             Icon='MainIcon')
         etree.SubElement(apps, 'RemoveFolder', Id='ApplicationProgramsFolder',
-                On='uninstall')
+                         On='uninstall')
         etree.SubElement(apps, 'RegistryValue', Root='HKCU',
-                Key='Software\Microsoft\%s' % self.package.name,
-                Name='installed', Type='integer', Value='1', KeyPath='yes')
+                         Key='Software\Microsoft\%s' % self.package.name,
+                         Name='installed', Type='integer', Value='1', KeyPath='yes')
         # Ref it in the main feature
         etree.SubElement(self.main_feature, 'ComponentRef',
-                Id='ApplicationShortcut')
+                         Id='ApplicationShortcut')
 
     def _add_vs_properties(self):
         etree.SubElement(self.product, 'PropertyRef', Id='VS2010DEVENV')
diff --git a/cerbero/packages/wix_packager.py b/cerbero/packages/wix_packager.py
index 457038f7..f7eaaea8 100644
--- a/cerbero/packages/wix_packager.py
+++ b/cerbero/packages/wix_packager.py
@@ -79,7 +79,6 @@ class MergeModulePackager(PackagerBase):
             for p in self.package.strip_dirs:
                 s.strip_dir(os.path.join(tmpdir, p))
 
-
         mergemodule = MergeModule(self.config, files_list, self.package)
         if tmpdir:
             mergemodule.prefix = tmpdir
@@ -91,7 +90,7 @@ class MergeModulePackager(PackagerBase):
         for x in ['utils']:
             wixobjs.append(os.path.join(output_dir, "%s.wixobj" % x))
             sources.append(os.path.join(os.path.abspath(self.config.data_dir),
-                           'wix/%s.wxs' % x))
+                                        'wix/%s.wxs' % x))
 
         if self._with_wine:
             wixobjs = [to_winepath(x) for x in wixobjs]
@@ -122,7 +121,7 @@ class MergeModulePackager(PackagerBase):
         else:
             platform = 'mingw'
         return "%s-%s-%s-%s" % (self.package.name, platform,
-                self.config.target_arch, version)
+                                self.config.target_arch, version)
 
 
 class MSIPackager(PackagerBase):
@@ -175,7 +174,7 @@ class MSIPackager(PackagerBase):
         else:
             platform = 'mingw'
         return "%s-%s-%s-%s" % (self.package.name, platform,
-                self.config.target_arch, self.package.version)
+                                self.config.target_arch, self.package.version)
 
     def _create_msi_installer(self, package_type):
         self.package.set_mode(package_type)
@@ -194,8 +193,8 @@ class MSIPackager(PackagerBase):
             packager = MergeModulePackager(self.config, package, self.store)
             try:
                 path = packager.create_merge_module(self.output_dir,
-                           package_type, self.force, self.package.version,
-                           self.keep_temp)
+                                                    package_type, self.force, self.package.version,
+                                                    self.keep_temp)
                 packagedeps[package] = path
             except EmptyPackageError:
                 m.warning("Package %s is empty" % package)
@@ -209,7 +208,7 @@ class MSIPackager(PackagerBase):
 
     def _create_msi(self, config_path):
         sources = [os.path.join(self.output_dir, "%s.wxs" %
-                   self._package_name())]
+                                self._package_name())]
         msi = MSI(self.config, self.package, self.packagedeps, config_path,
                   self.store)
         msi.write(sources[0])
@@ -219,7 +218,7 @@ class MSIPackager(PackagerBase):
         for x in ['utils']:
             wixobjs.append(os.path.join(self.output_dir, "%s.wixobj" % x))
             sources.append(os.path.join(os.path.abspath(self.config.data_dir),
-                           'wix/%s.wxs' % x))
+                                        'wix/%s.wxs' % x))
 
         if self._with_wine:
             wixobjs = [to_winepath(x) for x in wixobjs]