Mercurial Repositories > eric / file comparison
comparison: UI/UserInterface.py
UI/UserInterface.py
- branch
- 6_0_x
- changeset 4196
- e4016f53ad26
- parent 4140
- 22040bea71a0
- child 4198
- 417706a8fddb
equal
deleted
inserted
replaced
| 4194:092e5b213ace | 4196:e4016f53ad26 |
|---|---|
| 5900 self.__versionCheckProgress.reset() | 5900 self.__versionCheckProgress.reset() |
| 5901 self.__versionCheckProgress = None | 5901 self.__versionCheckProgress = None |
| 5902 return | 5902 return |
| 5903 | 5903 |
| 5904 reply = self.sender() | 5904 reply = self.sender() |
| 5905 | |
| 5906 # This is a hack because sometimes reply is not a QNetworkReply | |
| 5907 if not isinstance(reply, QNetworkReply): | |
| 5908 if reply in self.__replies: | |
| 5909 self.__replies.remove(reply) | |
| 5910 return | |
| 5911 | |
| 5912 reply.deleteLater() | |
| 5905 if reply in self.__replies: | 5913 if reply in self.__replies: |
| 5906 self.__replies.remove(reply) | 5914 self.__replies.remove(reply) |
| 5907 if reply.error() == QNetworkReply.NoError: | 5915 if reply.error() == QNetworkReply.NoError: |
| 5908 ioEncoding = Preferences.getSystem("IOEncoding") | 5916 ioEncoding = Preferences.getSystem("IOEncoding") |
| 5909 versions = str(reply.readAll(), ioEncoding, 'replace').splitlines() | 5917 versions = str(reply.readAll(), ioEncoding, 'replace').splitlines() |
| 5918 reply.close() | |
| 5910 if reply.error() != QNetworkReply.NoError or \ | 5919 if reply.error() != QNetworkReply.NoError or \ |
| 5911 len(versions) == 0 or \ | 5920 len(versions) == 0 or \ |
| 5912 versions[0].startswith("<"): | 5921 versions[0].startswith("<"): |
| 5913 # network error or an error page | 5922 # network error or an error page |
| 5914 self.httpAlternative += 1 | 5923 self.httpAlternative += 1 |
| 5915 if self.httpAlternative >= len(self.__httpAlternatives): | 5924 if self.httpAlternative >= len(self.__httpAlternatives): |
| 5916 self.__inVersionCheck = False | 5925 self.__inVersionCheck = False |
| 5917 if self.__versionCheckProgress is not None: | 5926 if self.__versionCheckProgress is not None: |
