diff -r 6e260b424396 -r 2b104ad132a4 src/eric7/VCS/ProjectHelper.py --- a/src/eric7/VCS/ProjectHelper.py Wed Nov 16 10:10:06 2022 +0100 +++ b/src/eric7/VCS/ProjectHelper.py Wed Nov 16 10:53:40 2022 +0100 @@ -320,7 +320,7 @@ if ok: self.project.openProject(str(dpath / pfilename)) if export: - self.project.pdata["VCS"] = "None" + self.project.setProjectData("None", dataKey="VCS") self.project.vcs = self.project.initVCS() self.project.setDirty(True) self.project.saveProject() @@ -346,12 +346,16 @@ if dlg.exec() == QDialog.DialogCode.Accepted: dlg.storeData() self.project.initFileTypes() - self.project.pdata["VCS"] = selectedVcsSystem + self.project.setProjectData( + selectedVcsSystem, dataKey="VCS" + ) self.project.setDirty(True) - if self.project.pdata["MAINSCRIPT"]: + if self.project.getProjectData(dataKey="MAINSCRIPT"): ms = os.path.join( self.project.ppath, - self.project.pdata["MAINSCRIPT"], + self.project.getProjectData( + dataKey="MAINSCRIPT" + ), ) if os.path.exists(ms): self.project.appendFile(ms) @@ -411,9 +415,13 @@ """ Local function to revert the changes made to the project object. """ - self.project.pdata["VCS"] = pdata_vcs - self.project.pdata["VCSOPTIONS"] = copy.deepcopy(pdata_vcsoptions) - self.project.pdata["VCSOTHERDATA"] = copy.deepcopy(pdata_vcsother) + self.project.setProjectData(pdata_vcs, dataKey="VCS") + self.project.setProjectData( + copy.deepcopy(pdata_vcsoptions), dataKey="VCSOPTIONS" + ) + self.project.setProjectData( + copy.deepcopy(pdata_vcsother), dataKey="VCSOTHERDATA" + ) self.project.vcs = vcs self.project.vcsProjectHelper = vcsHelper self.project.vcsBasicHelper = vcs is None @@ -421,9 +429,13 @@ self.project.setDirty(True) self.project.saveProject() - pdata_vcs = self.project.pdata["VCS"] - pdata_vcsoptions = copy.deepcopy(self.project.pdata["VCSOPTIONS"]) - pdata_vcsother = copy.deepcopy(self.project.pdata["VCSOTHERDATA"]) + pdata_vcs = self.project.getProjectData(dataKey="VCS") + pdata_vcsoptions = copy.deepcopy( + self.project.getProjectData(dataKey="VCSOPTIONS") + ) + pdata_vcsother = copy.deepcopy( + self.project.getProjectData(dataKey="VCSOTHERDATA") + ) vcs = self.project.vcs vcsHelper = self.project.vcsProjectHelper vcsSystemsDict = ( @@ -459,7 +471,7 @@ break if selectedVcsSystem is not None: - self.project.pdata["VCS"] = selectedVcsSystem + self.project.setProjectData(selectedVcsSystem, dataKey="VCS") self.project.vcs = self.project.initVCS(selectedVcsSystem) if self.project.vcs is not None: vcsdlg = self.project.vcs.vcsOptionsDialog(