UI/UserInterface.py

branch
5_1_x
changeset 1218
825a24cf43f7
parent 1194
9a54fec8559d
child 1359
97dc4ee2d655
equal deleted inserted replaced
1216:7877d4d4b095 1218:825a24cf43f7
5481 return 5481 return
5482 5482
5483 reply = self.sender() 5483 reply = self.sender()
5484 if reply in self.__replies: 5484 if reply in self.__replies:
5485 self.__replies.remove(reply) 5485 self.__replies.remove(reply)
5486 if reply.error() != QNetworkReply.NoError: 5486 if reply.error() == QNetworkReply.NoError:
5487 ioEncoding = Preferences.getSystem("IOEncoding")
5488 versions = str(reply.readAll(), ioEncoding, 'replace').splitlines()
5489 if reply.error() != QNetworkReply.NoError or versions[0].startswith("<"):
5490 # network error or an error page
5487 self.httpAlternative += 1 5491 self.httpAlternative += 1
5488 if self.httpAlternative >= len(self.__httpAlternatives): 5492 if self.httpAlternative >= len(self.__httpAlternatives):
5489 self.__inVersionCheck = False 5493 self.__inVersionCheck = False
5490 if self.__versionCheckProgress is not None: 5494 if self.__versionCheckProgress is not None:
5491 self.__versionCheckProgress.reset() 5495 self.__versionCheckProgress.reset()
5501 5505
5502 self.__inVersionCheck = False 5506 self.__inVersionCheck = False
5503 if self.__versionCheckProgress is not None: 5507 if self.__versionCheckProgress is not None:
5504 self.__versionCheckProgress.reset() 5508 self.__versionCheckProgress.reset()
5505 self.__versionCheckProgress = None 5509 self.__versionCheckProgress = None
5506 ioEncoding = Preferences.getSystem("IOEncoding")
5507 versions = str(reply.readAll(), ioEncoding, 'replace').splitlines()
5508 self.__updateVersionsUrls(versions) 5510 self.__updateVersionsUrls(versions)
5509 if self.showAvailableVersions: 5511 if self.showAvailableVersions:
5510 self.__showAvailableVersionInfos(versions) 5512 self.__showAvailableVersionInfos(versions)
5511 else: 5513 else:
5512 Preferences.Prefs.settings.setValue( 5514 Preferences.Prefs.settings.setValue(

eric ide

mercurial