version 0.6.7

src/calibre/constants.py

@@ -2,7 +2,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = 'calibre'
-__version__   = '0.6.6'
+__version__   = '0.6.7'
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 
 import re

src/calibre/gui2/update.py

@@ -1,27 +1,26 @@
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 
-import urllib, re, traceback
+import traceback
 
 from PyQt4.QtCore import QThread, SIGNAL
+import mechanize
 
-from calibre import __version__, __appname__
+from calibre.constants import __version__
-from calibre.ebooks.BeautifulSoup import BeautifulSoup
+from calibre import browser
+
+URL = 'http://status.calibre-ebook.com/latest'
 
 class CheckForUpdates(QThread):
-    
+
     def run(self):
         try:
-            src = urllib.urlopen('http://pypi.python.org/pypi/'+__appname__).read()
+            br = browser()
-            soup = BeautifulSoup(src)
+            req = mechanize.Request(URL)
-            meta = soup.find('link', rel='meta', title='DOAP')
+            req.add_header('CALIBRE_VERSION', __version__)
-            if meta:
+            version = br.open(req).read().strip()
-                src = meta['href']
+            if version and version != __version__:
-                match = re.search(r'version=(\S+)', src)
+                self.emit(SIGNAL('update_found(PyQt_PyObject)'), version)
-                if match:
-                    version = match.group(1)
-                    if version != __version__:
-                        self.emit(SIGNAL('update_found(PyQt_PyObject)'), version)
         except:
             traceback.print_exc()
-                    
+