← Back to branch summary

~xnox/ubuntu-archive-tools/sru-report-autopkgtest-vomit

« back to all changes in this revision

Viewing changes to sru-report

  • Committer: Colin Watson
  • Date: 2012-07-31 11:51:59 UTC
  • Revision ID: cjwatson@canonical.com-20120731115159-a0g2d0dmq3p18rjw
Simplify using collections.defaultdict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sru-report
25
25
 
26
26
from __future__ import print_function
27
27
 
 
28
from collections import defaultdict
28
29
from operator import itemgetter
29
30
 
30
31
import datetime
466
467
            'build_problems': { arch -> (state, URL) },
467
468
            }
468
469
    '''
469
 
    srus = {}
 
470
    srus = defaultdict(dict)
470
471
 
471
472
    for release in releases:
472
473
        #if release != 'quantal': continue # for quick testing
479
480
                pkg not in ('language-pack-en', 'language-pack-en-base')):
480
481
                continue
481
482
 
482
 
            srus.setdefault(release, {})[pkg] = current_versions(
483
 
                releases[release], pkg)
 
483
            srus[release][pkg] = current_versions(releases[release], pkg)
484
484
            srus[release][pkg]['bugs'] = match_srubugs(
485
485
                srus[release][pkg]['changesfile'])
486
486
 
536
536
    global lp, releases
537
537
    ppa = lp.people['canonical-kernel-team'].getPPAByName(name='ppa')
538
538
 
539
 
    kernels = {}
 
539
    kernels = defaultdict(dict)
540
540
    for release in releases:
541
541
        #if release != 'karmic': continue # for quick testing
542
542
        for published in ppa.getPublishedSources(status='Published',
564
564
            if apt_pkg.version_compare(published.source_package_version,
565
565
                    latest_ubuntu) > 0:
566
566
                (bugs, cves) = bugs_from_changes(change_url)
567
 
                kernels.setdefault(release, {})[
568
 
                    published.source_package_name] = {
569
 
                        'ppa_version': published.source_package_version,
570
 
                        'ubuntu_version': latest_ubuntu,
571
 
                        'bugs': bugs,
572
 
                        'cves': cves,
573
 
                        'changesfile': change_url,
574
 
                        }
 
567
                kernels[release][published.source_package_name] = {
 
568
                    'ppa_version': published.source_package_version,
 
569
                    'ubuntu_version': latest_ubuntu,
 
570
                    'bugs': bugs,
 
571
                    'cves': cves,
 
572
                    'changesfile': change_url,
 
573
                    }
575
574
            else:
576
575
                logging.debug('  version in PPA is not newer, skipping')
577
576