Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.1, 2.0.2, and 2.0.3

stable about: reimplement check for new version by using async Qt module (fixes #230)

Now it requires QtNetwork4.dll.

Changeset 7c13fe1529de…

Parent 3e5ed82b4056…

by Yuya Nishihara

Changes to one file · Browse files at 7c13fe1529de Showing diff from parent 3e5ed82b4056 Diff from another changeset...

Change 1 of 6 Show Entire File tortoisehg/​hgqt/​about.py Stacked
 
13
14
15
16
17
18
19
20
21
22
23
 
24
25
26
 
120
121
122
123
 
124
125
126
127
128
129
130
131
132
133
 
138
139
140
141
 
142
143
144
 
151
152
153
154
 
155
156
157
 
 
 
 
 
 
 
158
159
160
161
 
162
 
 
 
 
 
 
 
 
 
163
164
165
166
 
 
 
167
168
169
 
176
177
178
179
 
180
181
182
 
188
189
190
 
191
192
193
 
13
14
15
 
 
16
17
18
19
20
21
22
23
24
25
 
119
120
121
 
122
123
124
125
126
 
127
 
128
129
130
 
135
136
137
 
138
139
140
141
 
148
149
150
 
151
152
 
 
153
154
155
156
157
158
159
160
161
162
 
163
164
165
166
167
168
169
170
171
172
173
174
 
175
 
176
177
178
179
180
181
 
188
189
190
 
191
192
193
194
 
200
201
202
203
204
205
206
@@ -13,14 +13,13 @@
   import sys   -from mercurial import ui, url -  from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import qtlib  from tortoisehg.util import version, hglib, paths    from PyQt4.QtCore import *  from PyQt4.QtGui import * +from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest    class AboutDialog(QDialog):   """Dialog for showing info about TortoiseHg""" @@ -120,14 +119,12 @@
    @pyqtSlot()   def getUpdateInfo(self): - self.uthread = AboutUpdateThread() + self.uthread = AboutUpdateThread(self)   self.uthread.finished.connect(self.uFinished)   self.uthread.start()     def uFinished(self): - self.uthread.wait()   urldata = self.uthread.urldata - self.uthread = None   if urldata:   self.download_url_lbl.setText(urldata)   @@ -138,7 +135,7 @@
    def closeEvent(self, event):   if self.uthread: - self.uthread.wait() + self.uthread.abort()   self._writesettings()   super(AboutDialog, self).closeEvent(event)   @@ -151,19 +148,34 @@
  s.setValue('about/geom', self.saveGeometry())     -class AboutUpdateThread(QThread): +class AboutUpdateThread(QObject):   'Background thread for getting update info' - def __init__(self): - super(AboutUpdateThread, self).__init__() + finished = pyqtSignal() + + def __init__(self, parent=None): + super(AboutUpdateThread, self).__init__(parent) + # If we use QNetworkAcessManager elsewhere, it should be shared + # through the application. + self._netmanager = QNetworkAccessManager(self)     urldata = ''   - def run(self): + def start(self):   verurl = 'http://tortoisehg.bitbucket.org/curversion.txt' + self._newverreply = self._netmanager.get(QNetworkRequest(QUrl(verurl))) + self._newverreply.finished.connect(self._handlenewverreply) + + def abort(self): + if self._newverreply: + self._newverreply.abort() + + @pyqtSlot() + def _handlenewverreply(self):   newver = (0,0,0) - opener = url.opener(ui.ui())   try: - f = opener.open(verurl).read().splitlines() + f = self._newverreply.readAll().data().splitlines() + self._newverreply.close() + self._newverreply = None   newver = tuple([int(p) for p in f[0].split('.')])   upgradeurl = f[1] # generic download URL   platform = sys.platform @@ -176,7 +188,7 @@
  if platform == p:   upgradeurl = _url.strip()   break - except (OSError, IndexError, ImportError): + except (IndexError, ImportError):   pass   try:   thgv = version.version() @@ -188,6 +200,7 @@
  if newver > curver:   url_lbl = _('A new version of TortoiseHg is ready for download!')   self.urldata = ('<a href=%s>%s</a>' % (upgradeurl, url_lbl)) + self.finished.emit()      def run(ui, *pats, **opts):