← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/archiveuploader/nascentupload.py

  • Committer: Launchpad Patch Queue Manager
  • Date: 2011-10-26 11:51:32 UTC
  • mfrom: (14191.1.1 unicode-bug-806882)
  • Revision ID: launchpad@pqm.canonical.com-20111026115132-y7eo0lxw5ip1ghek
[r=stevenk][bug=806882][no-qa] Remove usage of encode('utf-8') when
        dealing with error messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/archiveuploader/nascentupload.py
391
391
        try:
392
392
            callable()
393
393
        except UploadError, error:
394
 
            self.reject("".join(error.args).encode("utf8"))
 
394
            self.reject("".join(error.args))
395
395
        except UploadWarning, error:
396
 
            self.warn("".join(error.args).encode("utf8"))
 
396
            self.warn("".join(error.args))
397
397
 
398
398
    def run_and_collect_errors(self, callable):
399
399
        """Run 'special' callable that generates a list of errors/warnings.
413
413
        """
414
414
        for error in callable():
415
415
            if isinstance(error, UploadError):
416
 
                self.reject("".join(error.args).encode("utf8"))
 
416
                self.reject("".join(error.args))
417
417
            elif isinstance(error, UploadWarning):
418
 
                self.warn("".join(error.args).encode("utf8"))
 
418
                self.warn("".join(error.args))
419
419
            else:
420
420
                raise AssertionError(
421
421
                    "Unknown error occurred: %s" % str(error))