Mercurial Repositories > eric / file comparison
comparison: UI/UserInterface.py
UI/UserInterface.py
- changeset 4195
- f504f89eb11e
- parent 4186
- e2bf1c32272b
- child 4197
- 43199b5d5cfe
equal
deleted
inserted
replaced
| 4193:9f1a21faa8ff | 4195:f504f89eb11e |
|---|---|
| 5952 self.__versionCheckProgress.reset() | 5952 self.__versionCheckProgress.reset() |
| 5953 self.__versionCheckProgress = None | 5953 self.__versionCheckProgress = None |
| 5954 return | 5954 return |
| 5955 | 5955 |
| 5956 reply = self.sender() | 5956 reply = self.sender() |
| 5957 | |
| 5958 # This is a hack because sometimes reply is not a QNetworkReply | |
| 5959 if not isinstance(reply, QNetworkReply): | |
| 5960 if reply in self.__replies: | |
| 5961 self.__replies.remove(reply) | |
| 5962 return | |
| 5963 | |
| 5964 reply.deleteLater() | |
| 5957 if reply in self.__replies: | 5965 if reply in self.__replies: |
| 5958 self.__replies.remove(reply) | 5966 self.__replies.remove(reply) |
| 5959 if reply.error() == QNetworkReply.NoError: | 5967 if reply.error() == QNetworkReply.NoError: |
| 5960 ioEncoding = Preferences.getSystem("IOEncoding") | 5968 ioEncoding = Preferences.getSystem("IOEncoding") |
| 5961 versions = str(reply.readAll(), ioEncoding, 'replace').splitlines() | 5969 versions = str(reply.readAll(), ioEncoding, 'replace').splitlines() |
| 5970 reply.close() | |
| 5962 if reply.error() != QNetworkReply.NoError or \ | 5971 if reply.error() != QNetworkReply.NoError or \ |
| 5963 len(versions) == 0 or \ | 5972 len(versions) == 0 or \ |
| 5964 versions[0].startswith("<"): | 5973 versions[0].startswith("<"): |
| 5965 # network error or an error page | 5974 # network error or an error page |
| 5966 self.httpAlternative += 1 | 5975 self.httpAlternative += 1 |
| 5967 if self.httpAlternative >= len(self.__httpAlternatives): | 5976 if self.httpAlternative >= len(self.__httpAlternatives): |
| 5968 self.__inVersionCheck = False | 5977 self.__inVersionCheck = False |
| 5969 if self.__versionCheckProgress is not None: | 5978 if self.__versionCheckProgress is not None: |
