--- a/eric6/Plugins/VcsPlugins/vcsGit/git.py Mon Oct 05 19:51:55 2020 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsGit/git.py Tue Oct 06 17:52:44 2020 +0200
@@ -279,7 +279,7 @@
dia = GitDialog(self.tr('Creating Git repository'), self)
res = dia.startProcess(args)
if res:
- dia.exec_()
+ dia.exec()
status = dia.normalExit()
if status:
@@ -296,7 +296,7 @@
self)
res = dia.startProcess(args, projectDir)
if res:
- dia.exec_()
+ dia.exec()
status = dia.normalExit()
if status:
@@ -307,7 +307,7 @@
self)
res = dia.startProcess(args, projectDir)
if res:
- dia.exec_()
+ dia.exec()
status = dia.normalExit()
return status, False
@@ -337,7 +337,7 @@
self)
res = dia.startProcess(args)
if res:
- dia.exec_()
+ dia.exec()
return dia.normalExit()
def vcsExport(self, vcsDataDict, projectDir):
@@ -487,7 +487,7 @@
self)
res = dia.startProcess(args, dname)
if res:
- dia.exec_()
+ dia.exec()
self.committed.emit()
self.checkVCSStatus()
@@ -541,7 +541,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
return res
@@ -589,7 +589,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def vcsAddBinary(self, name, isDir=False):
"""
@@ -664,7 +664,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.normalExitWithoutErrors()
return res
@@ -690,7 +690,7 @@
else:
from .GitCopyDialog import GitCopyDialog
dlg = GitCopyDialog(name, None, True)
- accepted = dlg.exec_() == QDialog.Accepted
+ accepted = dlg.exec() == QDialog.Accepted
if accepted:
target, force = dlg.getData()
@@ -717,7 +717,7 @@
dia = GitDialog(self.tr('Renaming {0}').format(name), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.normalExit()
if res:
if target.startswith(project.getProjectPath()):
@@ -842,7 +842,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
@@ -887,7 +887,7 @@
"Do you really want to revert all changes to these files"
" or directories?"),
names)
- yes = dlg.exec_() == QDialog.Accepted
+ yes = dlg.exec() == QDialog.Accepted
else:
yes = E5MessageBox.yesNo(
None,
@@ -898,7 +898,7 @@
dia = GitDialog(self.tr('Reverting changes'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
else:
@@ -926,7 +926,7 @@
self.gitGetBranchesList(repodir, withMaster=True),
self.gitGetCurrentBranch(repodir),
self.gitGetBranchesList(repodir, remotes=True))
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
commit, doCommit, commitMessage, addLog, diffStat = (
dlg.getParameters()
)
@@ -951,7 +951,7 @@
dia = GitDialog(self.tr('Merging').format(name), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
self.checkVCSStatus()
def vcsSwitch(self, name):
@@ -979,7 +979,7 @@
trackingBranchesList=self.gitGetBranchesList(
repodir, remotes=True),
noneLabel=self.tr("Master branch head"))
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
rev = dlg.getRevision()
return self.vcsUpdate(name, revision=rev)
@@ -1184,7 +1184,7 @@
"""
from .GitCommandDialog import GitCommandDialog
dlg = GitCommandDialog(self.commandHistory, name)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
command = dlg.getData()
commandList = Utilities.parseOptionString(command)
@@ -1207,7 +1207,7 @@
dia = GitDialog(self.tr('Git Command'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def vcsOptionsDialog(self, project, archive, editable=False, parent=None):
"""
@@ -1426,7 +1426,7 @@
"""
from .GitCopyDialog import GitCopyDialog
dlg = GitCopyDialog(name)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
target, force = dlg.getData()
# step 1: copy the file/directory:
@@ -1515,7 +1515,7 @@
from .GitRevisionsSelectionDialog import GitRevisionsSelectionDialog
dlg = GitRevisionsSelectionDialog(self.gitGetTagsList(repodir),
self.gitGetBranchesList(repodir))
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
revisions = dlg.getRevisions()
if self.diff is None:
from .GitDiffDialog import GitDiffDialog
@@ -1599,7 +1599,7 @@
)
dlg = GitRevisionsSelectionDialog(self.gitGetTagsList(repodir),
self.gitGetBranchesList(repodir))
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
rev1, rev2 = dlg.getRevisions()
elif revisions:
rev1, rev2 = revisions[0], revisions[1]
@@ -1663,7 +1663,7 @@
from .GitFetchDialog import GitFetchDialog
dlg = GitFetchDialog(self, repodir)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
(remote, url, remoteBranches, localBranch, fetchAll, prune,
includeTags) = dlg.getData()
@@ -1686,7 +1686,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
self.checkVCSStatus()
def gitPull(self, name):
@@ -1706,7 +1706,7 @@
from .GitPullDialog import GitPullDialog
dlg = GitPullDialog(self, repodir)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
remote, url, branches, pullAll, prune = dlg.getData()
args = self.initCommand('pull')
@@ -1724,7 +1724,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
return res
@@ -1746,7 +1746,7 @@
from .GitPushDialog import GitPushDialog
dlg = GitPushDialog(self, repodir)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
remote, refspecs, tags, tracking, submodule = dlg.getData()
args = self.initCommand("push")
@@ -1765,7 +1765,7 @@
self.tr('Pushing to a remote Git repository'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
self.checkVCSStatus()
def gitCommitMerge(self, name):
@@ -1792,7 +1792,7 @@
dia = GitDialog(self.tr('Committing failed merge'), self)
res = dia.startProcess(args, repodir, environment=env)
if res:
- dia.exec_()
+ dia.exec()
self.committed.emit()
self.checkVCSStatus()
@@ -1821,7 +1821,7 @@
self)
res = dia.startProcess(args, repodir, False)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
return res
@@ -1854,7 +1854,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def gitApplyCheckPatches(self, projectDir, check=False):
"""
@@ -1873,7 +1873,7 @@
from .GitPatchFilesDialog import GitPatchFilesDialog
dlg = GitPatchFilesDialog(repodir, self.__patchCheckData)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
patchFilesList, stripCount, inaccurateEof, recount = dlg.getData()
if patchFilesList:
args = self.initCommand("apply")
@@ -1897,7 +1897,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
if not check:
self.checkVCSStatus()
@@ -1940,7 +1940,7 @@
from .GitTagDialog import GitTagDialog
dlg = GitTagDialog(self.gitGetTagsList(repodir), revision, tagName)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
tag, revision, tagOp, tagType, force = dlg.getParameters()
else:
return False
@@ -1970,7 +1970,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
return True
@@ -2136,7 +2136,7 @@
dlg = GitBranchDialog(
self.gitGetBranchesList(repodir, allBranches=True),
revision, branchName, branchOp)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
branchOp, branch, revision, newBranch, remoteBranch, force = (
dlg.getParameters()
)
@@ -2197,7 +2197,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
if branchOp in [GitBranchDialog.CreateSwitchBranch,
GitBranchDialog.CreateTrackingBranch]:
update = dia.hasAddOrDelete()
@@ -2226,7 +2226,7 @@
dlg = GitBranchPushDialog(self.gitGetBranchesList(repodir),
self.gitGetRemotesList(repodir),
delete=True)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
branchName, remoteName = dlg.getData()[:2]
args = self.initCommand("push")
@@ -2236,7 +2236,7 @@
dia = GitDialog(self.tr('Delete Remote Branch'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def gitShowBranch(self, name):
"""
@@ -2280,7 +2280,7 @@
from .GitBundleDialog import GitBundleDialog
dlg = GitBundleDialog(self.gitGetTagsList(repodir),
self.gitGetBranchesList(repodir))
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
revs = dlg.getData()
fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
@@ -2321,7 +2321,7 @@
dia = GitDialog(self.tr('Create Bundle'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def gitVerifyBundle(self, projectDir):
"""
@@ -2351,7 +2351,7 @@
dia = GitDialog(self.tr('Verify Bundle'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def gitBundleListHeads(self, projectDir):
"""
@@ -2381,7 +2381,7 @@
dia = GitDialog(self.tr('List Bundle Heads'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def gitGetBundleHeads(self, repodir, bundleFile):
"""
@@ -2441,7 +2441,7 @@
dlg = GitApplyBundleDataDialog(
self.gitGetBundleHeads(repodir, fname),
self.gitGetBranchesList(repodir))
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
bundleHead, branch = dlg.getData()
args = self.initCommand("fetch")
@@ -2456,7 +2456,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
@@ -2489,7 +2489,7 @@
dlg = GitApplyBundleDataDialog(
self.gitGetBundleHeads(repodir, fname),
self.gitGetBranchesList(repodir))
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
bundleHead, branch = dlg.getData()
args = self.initCommand("pull")
@@ -2504,7 +2504,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
@@ -2548,7 +2548,7 @@
self.gitGetBranchesList(repodir),
showBranches=showBranches,
showHead=showHead)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
rev = dlg.getRevision()
else:
return False
@@ -2557,7 +2557,7 @@
if subcommand == "start_extended":
from .GitBisectStartDialog import GitBisectStartDialog
dlg = GitBisectStartDialog()
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
bad, good, noCheckout = dlg.getData()
args.append("start")
if noCheckout:
@@ -2577,7 +2577,7 @@
self.tr('Git Bisect ({0})').format(subcommand), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
@@ -2732,7 +2732,7 @@
self.tr('Git Bisect ({0})').format("replay"), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
@@ -2890,7 +2890,7 @@
dia = GitDialog(self.tr('Show Remote Info'), self)
res = dia.startProcess(args, repodir, showArgs=False)
if res:
- dia.exec_()
+ dia.exec()
def gitShowRemotes(self, projectDir):
"""
@@ -2922,7 +2922,7 @@
from .GitAddRemoteDialog import GitAddRemoteDialog
dlg = GitAddRemoteDialog()
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
name, url = dlg.getData()
args = self.initCommand("remote")
args.append("add")
@@ -2983,7 +2983,7 @@
from .GitChangeRemoteUrlDialog import GitChangeRemoteUrlDialog
dlg = GitChangeRemoteUrlDialog(remoteName, remoteUrl)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
name, url = dlg.getData()
if url != remoteUrl:
args = self.initCommand("remote")
@@ -3017,7 +3017,7 @@
from .GitRemoteCredentialsDialog import GitRemoteCredentialsDialog
dlg = GitRemoteCredentialsDialog(remoteName, remoteUrl)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
name, url = dlg.getData()
if url != remoteUrl:
args = self.initCommand("remote")
@@ -3070,7 +3070,7 @@
dia = GitDialog(self.tr('Show Remote Info'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def gitShortlog(self, projectDir, commit):
"""
@@ -3094,7 +3094,7 @@
dia = GitDialog(self.tr('Show Shortlog'), self)
res = dia.startProcess(args, repodir, showArgs=False)
if res:
- dia.exec_()
+ dia.exec()
def gitDescribe(self, projectDir, commits):
"""
@@ -3135,7 +3135,7 @@
from .GitCherryPickDialog import GitCherryPickDialog
dlg = GitCherryPickDialog(commits)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
commits, cherrypickInfo, signoff, nocommit = (
dlg.getData()
)
@@ -3153,7 +3153,7 @@
dia = GitDialog(self.tr('Cherry-pick'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
return res
@@ -3183,7 +3183,7 @@
dia = GitDialog(self.tr('Copy Changesets (Continue)'), self)
res = dia.startProcess(args, repodir, environment=env)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
return res
@@ -3208,7 +3208,7 @@
dia = GitDialog(self.tr('Copy Changesets (Quit)'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
return res
@@ -3234,7 +3234,7 @@
dia = GitDialog(self.tr('Copy Changesets (Cancel)'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
return res
@@ -3297,7 +3297,7 @@
res = False
from .GitStashDataDialog import GitStashDataDialog
dlg = GitStashDataDialog()
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
message, keepIndex, untracked = dlg.getData()
args = self.initCommand("stash")
args.append("save")
@@ -3313,7 +3313,7 @@
dia = GitDialog(self.tr('Saving stash'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
return res
@@ -3398,7 +3398,7 @@
dia = GitDialog(self.tr('Restoring stash'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
return res
@@ -3438,7 +3438,7 @@
dia = GitDialog(self.tr('Restoring stash'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
return res
@@ -3487,7 +3487,7 @@
dia = GitDialog(self.tr('Creating branch'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
res = dia.hasAddOrDelete()
self.checkVCSStatus()
return res
@@ -3532,7 +3532,7 @@
dia = GitDialog(self.tr('Deleting stash'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
return res
def gitStashClear(self, projectDir):
@@ -3560,7 +3560,7 @@
dia = GitDialog(self.tr('Deleting all stashes'), self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
return res
def gitEditConfig(self, projectDir):
@@ -3596,7 +3596,7 @@
if not os.path.exists(cfgFile):
from .GitUserConfigDataDialog import GitUserConfigDataDialog
dlg = GitUserConfigDataDialog()
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
firstName, lastName, email = dlg.getData()
else:
firstName, lastName, email = (
@@ -3634,7 +3634,7 @@
self)
res = dia.startProcess(args, repodir, False)
if res:
- dia.exec_()
+ dia.exec()
def gitVerify(self, projectDir):
"""
@@ -3660,7 +3660,7 @@
self)
res = dia.startProcess(args, repodir, False)
if res:
- dia.exec_()
+ dia.exec()
def gitHouseKeeping(self, projectDir):
"""
@@ -3685,7 +3685,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def gitStatistics(self, projectDir):
"""
@@ -3760,7 +3760,7 @@
else:
info.append(self.tr("<p><b>No statistics available.</b></p>"))
dlg = VcsRepositoryInfoDialog(None, "\n".join(info))
- dlg.exec_()
+ dlg.exec()
def gitGetArchiveFormats(self, repodir):
"""
@@ -3811,7 +3811,7 @@
self.gitGetBranchesList(repodir, withMaster=True),
self.gitGetArchiveFormats(repodir)
)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
commit, archiveFormat, fileName, prefix = dlg.getData()
args = self.initCommand("archive")
args.append("--format={0}".format(archiveFormat))
@@ -3828,7 +3828,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
###########################################################################
## Methods related to submodules.
@@ -3850,7 +3850,7 @@
from .GitSubmoduleAddDialog import GitSubmoduleAddDialog
dlg = GitSubmoduleAddDialog(self, repodir)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
repo, branch, name, path, force = dlg.getData()
args = self.initCommand("submodule")
args.append("add")
@@ -3871,7 +3871,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def __gitSubmodulesList(self, repodir):
"""
@@ -3932,7 +3932,7 @@
if submodulesList:
from .GitSubmodulesListDialog import GitSubmodulesListDialog
dlg = GitSubmodulesListDialog(submodulesList)
- dlg.exec_()
+ dlg.exec()
else:
E5MessageBox.information(
None,
@@ -3978,7 +3978,7 @@
from .GitListDialog import GitListDialog
dlg = GitListDialog(sorted(paths))
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
selectedPaths = dlg.getSelection()
return selectedPaths, True
else:
@@ -4009,7 +4009,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def gitSubmoduleDeinit(self, projectDir):
"""
@@ -4030,7 +4030,7 @@
from .GitSubmodulesDeinitDialog import GitSubmodulesDeinitDialog
dlg = GitSubmodulesDeinitDialog(paths)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
deinitAll, submodulePaths, force = dlg.getData()
args = self.initCommand("submodule")
args.append("deinit")
@@ -4046,7 +4046,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def gitSubmoduleUpdate(self, projectDir, initialize=False, remote=False):
"""
@@ -4081,7 +4081,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def gitSubmoduleUpdateWithOptions(self, projectDir):
"""
@@ -4105,7 +4105,7 @@
GitSubmodulesUpdateOptionsDialog
)
dlg = GitSubmodulesUpdateOptionsDialog(paths)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
procedure, init, remote, noFetch, force, submodulePaths = (
dlg.getData()
)
@@ -4128,7 +4128,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def gitSubmoduleSync(self, projectDir):
"""
@@ -4149,7 +4149,7 @@
from .GitSubmodulesSyncDialog import GitSubmodulesSyncDialog
dlg = GitSubmodulesSyncDialog(paths)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
submodulePaths, recursive = dlg.getData()
args = self.initCommand("submodule")
args.append("sync")
@@ -4162,7 +4162,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
def gitSubmoduleStatus(self, projectDir):
"""
@@ -4199,7 +4199,7 @@
GitSubmodulesSummaryOptionsDialog
)
dlg = GitSubmodulesSummaryOptionsDialog(paths)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
submodulePaths, superProject, index, commit, limit = dlg.getData()
args = self.initCommand("submodule")
args.append("summary")
@@ -4221,7 +4221,7 @@
self)
res = dia.startProcess(args, repodir)
if res:
- dia.exec_()
+ dia.exec()
###########################################################################
## Methods to get the helper objects are below.
