← Back to branch summary

~xnox/usb-creator/wipeout

« back to all changes in this revision

Viewing changes to usbcreator/install.py

  • Committer: Colin Watson
  • Date: 2012-05-04 10:35:51 UTC
  • Revision ID: cjwatson@canonical.com-20120504103551-l9lk95pae7oah10l
Change 'except StandardError' to 'except Exception'; StandardError was
removed in Python 3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
usbcreator/install.py
56
56
                if callable(self.progress):
57
57
                    self.progress(v, est[0], est[1])
58
58
                self._stopevent.wait(2)
59
 
        except StandardError:
 
59
        except Exception:
60
60
            logging.exception('Could not update progress:')
61
61
 
62
62
    def join(self, timeout=None):
147
147
            else:
148
148
                self.install()
149
149
            self._success()
150
 
        except StandardError as e:
 
150
        except Exception as e:
151
151
            # TODO evand 2009-07-25: Bring up our own apport-like utility.
152
152
            logging.exception('Exception raised:')
153
153
            self._failure(_('An uncaught exception was raised:\n%s') % str(e))
440
440
                md5sum, filename = line.split()
441
441
                filename = os.path.normpath(filename[2:])
442
442
                md5sums[filename] = md5sum
443
 
        except StandardError:
 
443
        except Exception:
444
444
            logging.error('Could not generate the md5sum list from md5sum.txt.')
445
445
 
446
446
        self.progress_message(_('Copying files...'))