← Back to branch summary

~brian.curtin/ubuntu-sso-client/py3-iter-removal

« back to all changes in this revision

Viewing changes to ubuntu_sso/qt/__init__.py

  • Committer: Brian Curtin
  • Date: 2012-06-22 20:28:49 UTC
  • mfrom: (972.2.2 ubuntu-sso-client-iter)
  • Revision ID: brian.curtin@canonical.com-20120622202849-rtueougc324et7ki
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntu_sso/qt/__init__.py
75
75
            if 'errtype' in errordict:
76
76
                del errordict['errtype']
77
77
            result = '\n'.join(
78
 
                [('%s: %s' % (k, v)) for k, v in errordict.iteritems()])
 
78
                [('%s: %s' % (k, v)) for k, v in errordict.items()])
79
79
    else:
80
80
        result = GENERIC_BACKEND_ERROR
81
81
        logger.error('build_general_error_message with unknown error: %r',