summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-08-08 22:07:38 -0500
committerDan McGee <dan@archlinux.org>2012-08-08 22:07:38 -0500
commitad05f3eb2c8511c63dbdc9378bf3561ab949e940 (patch)
treec68a066f416891b0ac45c4fef5d9f724da0f2ff7
parent241ff8fbd79f9f17cd326a34eb39096851f630ba (diff)
PEP8 cleanups in package utils
Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--packages/utils.py17
1 files changed, 11 insertions, 6 deletions
diff --git a/packages/utils.py b/packages/utils.py
index d4b4e611..d95c015f 100644
--- a/packages/utils.py
+++ b/packages/utils.py
@@ -36,7 +36,7 @@ def parse_version(version):
def get_group_info(include_arches=None):
raw_groups = PackageGroup.objects.values_list(
'name', 'pkg__arch__name').order_by('name').annotate(
- cnt=Count('pkg'), last_update=Max('pkg__last_update'))
+ cnt=Count('pkg'), last_update=Max('pkg__last_update'))
# now for post_processing. we need to seperate things out and add
# the count in for 'any' to all of the other architectures.
group_mapping = {}
@@ -71,6 +71,7 @@ def get_group_info(include_arches=None):
groups.extend(val.itervalues())
return sorted(groups, key=itemgetter('name', 'arch'))
+
def get_split_packages_info():
'''Return info on split packages that do not have an actual package name
matching the split pkgbase.'''
@@ -276,6 +277,7 @@ def approved_by_signoffs(signoffs, spec):
return good_signoffs >= spec.required
return False
+
class PackageSignoffGroup(object):
'''Encompasses all packages in testing with the same pkgbase.'''
def __init__(self, packages):
@@ -375,6 +377,7 @@ SELECT DISTINCT s.id
AND p.repo_id IN (%s)
"""
+
def get_current_signoffs(repos):
'''Returns a mapping of pkgbase -> signoff objects for the given repos.'''
cursor = connection.cursor()
@@ -389,6 +392,7 @@ def get_current_signoffs(repos):
signoffs = Signoff.objects.select_related('user').in_bulk(to_fetch)
return signoffs.values()
+
def get_current_specifications(repos):
'''Returns a mapping of pkgbase -> signoff specification objects for the
given repos.'''
@@ -401,6 +405,7 @@ def get_current_specifications(repos):
to_fetch = [row[0] for row in results]
return SignoffSpecification.objects.in_bulk(to_fetch).values()
+
def get_target_repo_map(repos):
sql = """
SELECT DISTINCT p1.pkgbase, r.name
@@ -421,6 +426,7 @@ SELECT DISTINCT p1.pkgbase, r.name
cursor.execute(sql, params)
return dict(cursor.fetchall())
+
def get_signoff_groups(repos=None, user=None):
if repos is None:
repos = Repo.objects.filter(testing=True)
@@ -458,12 +464,12 @@ def get_signoff_groups(repos=None, user=None):
class PackageJSONEncoder(DjangoJSONEncoder):
- pkg_attributes = [ 'pkgname', 'pkgbase', 'repo', 'arch', 'pkgver',
+ pkg_attributes = ['pkgname', 'pkgbase', 'repo', 'arch', 'pkgver',
'pkgrel', 'epoch', 'pkgdesc', 'url', 'filename', 'compressed_size',
'installed_size', 'build_date', 'last_update', 'flag_date',
- 'maintainers', 'packager' ]
- pkg_list_attributes = [ 'groups', 'licenses', 'conflicts',
- 'provides', 'replaces', 'depends' ]
+ 'maintainers', 'packager']
+ pkg_list_attributes = ['groups', 'licenses', 'conflicts',
+ 'provides', 'replaces', 'depends']
def default(self, obj):
if hasattr(obj, '__iter__'):
@@ -488,5 +494,4 @@ class PackageJSONEncoder(DjangoJSONEncoder):
return obj.username
return super(PackageJSONEncoder, self).default(obj)
-
# vim: set ts=4 sw=4 et: