eric: comparison src/eric7/UI/UserInterface.py

-:b011307033d5
+:bb05d1db9286
 return
 opens = 0
 for filename in args.file_or_project:
 try:
-ext = os.path.normcase(os.path.splitext(filename)[1])
+ext = os.path.splitext(filename)[1].lower()
 except IndexError:
 ext = ""
 if ext in (".epj",):
 self.project.openProject(filename)
 ##############################################################
 ## Remote Server menu
 ##############################################################
-self.__menus["server"] = self.__ericServerInterface.initMenu()
+self.__menus["server"] = self.__ericServerInterface.initMenus()
 ##############################################################
 ## Sessions menu
 ##############################################################
 self.__performUpgrade("ericpyqt")
 return True
 return False
-def __performUpgrade(self, upgradeType):
+def __performUpgrade(self, upgradeType, startup=False):
 """
 Private method to perform the requested upgrade operation.
 This action needs to shut down eric first, start a non-PyQt application
 performing the upgrade of the PyQt packages via pip and restart eric
 with the passed arguments. The upgrade process is not visible.
 @param upgradeType upgrade operation (one of 'eric', 'ericpyqt',
 'pyqt')
 @type str
+@param startup flag indicating a call during the IDE startup (defaults to False)
+@type bool (optional)
 """
 ericApp().closeAllWindows()
 program = PythonUtilities.getPythonExecutable()
-ericStartArgs = ["-m", "eric7", "--start-session"]
+ericStartArgs = (
+["-m", "eric7"] if startup else ["-m", "eric7", "--start-session"]
+)
 ericStartArgs.extend(self.__restartArgs)
 upgrader = os.path.join(os.path.dirname(__file__), "upgrader.py")
 upgraderArgs = [
 upgrader,
 from eric7.IconEditor.IconEditorWindow import IconEditorWindow
 dlg = IconEditorWindow(fn, self, fromEric=True, project=self.project)
 dlg.show()
-@pyqtSlot()
 @pyqtSlot(str)
 def __showPixmap(self, fn):
 """
 Private slot to show a pixmap in a dialog.
 dlg = PixmapDiagram(fn, self)
 if dlg.getStatus():
 dlg.show()
-@pyqtSlot()
 @pyqtSlot(str)
 def __showSvg(self, fn):
 """
 Private slot to show a SVG file in a dialog.
 self.shutdownCalled = True
 # shut down the global file system watcher
 EricFileSystemWatcher.instance().shutdown()
+# revert changes to sys.stdout and sys.stderr
+sys.stdout = sys.__stdout__
+sys.stderr = sys.__stderr__
 return True
 def isOnline(self):
 """
 Public method to get the online state.
 ##############################################
 ## Below are methods to check for new versions
 ##############################################
-def performVersionCheck(self):
+def performVersionCheck(self, startup=False):
 """
 Public method to check for an update even if not installed via PyPI.
+@param startup flag indicating a call during the IDE startup (defaults to False)
+@type bool (optional)
+@return flag indicating an upgrade is available and was selected by the user
+@rtype bool
 """
 if self.isOnline():
 if VersionOnly.startswith(("rev_", "@@")):
 # cannot check against development or source installation
-return
+return False
 else:
 period = Preferences.getUI("PerformVersionCheck")
 if period == 0:
-return
+return False
 elif period in [2, 3, 4]:
 lastCheck = Preferences.getSettings().value(
 "Updates/LastCheckDate", QDate(1970, 1, 1)
 )
 if lastCheck.isValid():
 period == 4
 and (lastCheck.daysTo(now) < lastCheck.daysInMonth())
 )
 ):
 # daily, weekly, monthly
-return
+return False
 versionTuple = EricUtilities.versionToTuple(VersionOnly)
 availableVersions = self.pipInterface.getPackageVersions("eric-ide")
 newerVersionsTuple = [
 EricUtilities.versionToTuple(v)
 if p not in (0, None)
 ),
 ),
 )
 if yes and self.__shutdown():
-self.__performUpgrade("eric")
+self.__performUpgrade("eric", startup=startup)
+return True
+return False
 def __sslErrors(self, reply, errors):
 """
 Private slot to handle SSL errors.

Mercurial Repositories > eric / file comparison

comparison: src/eric7/UI/UserInterface.py

src/eric7/UI/UserInterface.py