diff --git a/NEWS b/NEWS index 96fc938..3a73ab9 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +1.4.3: June 16, 2008: + * Fixed a bug in which an image thumbnail could not be loaded unless + you had a valid session. This prevented thumbnails from showing up + if, for instance, you were reading the Luminotes blog from an RSS + reader that didn't establish a session. + 1.4.2: June 16, 2008: * Fixed a bug that caused image files to get deleted if there were multiple images embedded within a single note. diff --git a/controller/Files.py b/controller/Files.py index d2eb25f..257b558 100644 --- a/controller/Files.py +++ b/controller/Files.py @@ -150,7 +150,7 @@ class FieldStorage( cherrypy._cpcgifs.FieldStorage ): # uploading try: cherrypy.session.release_lock() - except KeyError: + except ( KeyError, OSError ): pass # pluck the file id out of the query string. it would be preferable to grab it out of parsed @@ -257,7 +257,7 @@ class Files( object ): # download is cancelled before it's done, the lock won't be released try: cherrypy.session.release_lock() - except KeyError: + except ( KeyError, OSError ): pass db_file = self.__database.load( File, file_id ) @@ -350,7 +350,7 @@ class Files( object ): """ try: cherrypy.session.release_lock() - except KeyError: + except ( KeyError, OSError ): pass db_file = self.__database.load( File, file_id ) @@ -411,7 +411,7 @@ class Files( object ): """ try: cherrypy.session.release_lock() - except KeyError: + except ( KeyError, OSError ): pass db_file = self.__database.load( File, file_id ) @@ -567,7 +567,7 @@ class Files( object ): # upload is cancelled before it's done, the lock won't be released try: cherrypy.session.release_lock() - except KeyError: + except ( KeyError, OSError ): pass # poll until the file is uploading (as determined by current_uploads) or completely uploaded (in